From f91b93f16aa9c544ec4023c64c15a0220a09c2fc Mon Sep 17 00:00:00 2001
From: mainzelm <mainzelm>
Date: Wed, 6 Jun 2001 11:06:05 +0000
Subject: [PATCH] Sync with scsh tree

---
 scsh/lib/char-package.scm  |  4 ++--
 scsh/lib/cset-obsolete.scm | 12 ++++++++----
 scsh/scsh-package.scm      |  4 ++--
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/scsh/lib/char-package.scm b/scsh/lib/char-package.scm
index 1d535c1..318aafd 100644
--- a/scsh/lib/char-package.scm
+++ b/scsh/lib/char-package.scm
@@ -1,7 +1,7 @@
 ;;; These defs are things for characters *not* in SRFIs 13 & 14.
 ;;; It includes some R5RS defs that are not correct in S48 in a Latin-1 world.
 
-(define-interface char-set-predicates-interface
+(define-interface char-predicates-interface
   (export
    ((char-lower-case?		; R5RS
      char-upper-case?		; R5RS
@@ -24,7 +24,7 @@
      char-ascii?)		(proc (:char) :boolean))))
 
 
-(define-structure char-set-predicates-lib char-set-predicates-interface
+(define-structure char-predicates-lib char-predicates-interface
   (open error-package	; ERROR
 	scsh-utilities	; DEPRECATED-PROC
 	char-set-lib
diff --git a/scsh/lib/cset-obsolete.scm b/scsh/lib/cset-obsolete.scm
index c37e761..cb041c4 100644
--- a/scsh/lib/cset-obsolete.scm
+++ b/scsh/lib/cset-obsolete.scm
@@ -6,8 +6,9 @@
 	  chars->char-set		; list->char-set
 	  ascii-range->char-set		; ucs-range->char-set (not exact)
 	  predicate->char-set		; char-set-filter (not exact)
-	  ->char-set			; no longer handles a predicate
+	  ;->char-set			; no longer handles a predicate
 	  char-set-every?		; char-set-every
+	  char-set-any?			; char-set-any
 
 	  char-set-invert		; char-set-complement
 	  char-set-invert!		; char-set-complement!
@@ -38,13 +39,16 @@
 		       "Change code to use CHAR-SET-FILTER."))
     (define char-set-every?
       (deprecated-proc char-set-every 'char-set-every?
-		       "Use CHAR-SET-EVERYyn instead."))
+		       "Use CHAR-SET-EVERY instead."))
+    (define char-set-any?
+      (deprecated-proc char-set-every 'char-set-any?
+		       "Use CHAR-SET-ANY instead."))
     (define char-set-invert
       (deprecated-proc char-set-complement 'char-set-invert
-		       "Use CHAR-SET-COMPLEMENTyn instead."))
+		       "Use CHAR-SET-COMPLEMENT instead."))
     (define char-set-invert!
       (deprecated-proc char-set-complement! 'char-set-invert!
-		       "Use CHAR-SET-COMPLEMENT!yn instead."))
+		       "Use CHAR-SET-COMPLEMENT! instead."))
 
     (define char-set:alphabetic		char-set:letter)
     (define char-set:numeric		char-set:digit)
diff --git a/scsh/scsh-package.scm b/scsh/scsh-package.scm
index 5b37e8f..aac1bcc 100644
--- a/scsh/scsh-package.scm
+++ b/scsh/scsh-package.scm
@@ -372,7 +372,7 @@
 ;		      scsh-dbm-interface
 		      (export repl)
 		      awk-interface
-		      char-set-predicates-interface; Urk -- Some of this is R5RS!
+		      char-predicates-interface; Urk -- Some of this is R5RS!
 		      obsolete-char-set-interface
 		      )
 
@@ -387,7 +387,7 @@
 ;	dbm
 	awk-package
 	field-reader-package
-	char-set-predicates-lib	; Urk -- Some of this is R5RS!
+	char-predicates-lib	; Urk -- Some of this is R5RS!
 	dot-locking
 	scheme)