(set-case-syntax-set-multibyte): This variable

deleted.
(set-case-syntax-charset): New variable.
(set-case-syntax-1): New function.
(set-case-syntax-delims, set-case-syntax-pair, set-case-syntax):
Call set-case-syntax-1 on arguments.

1 files changed, 14 insertions, 1 deletions

diff --git a/lisp/case-table.el b/lisp/case-table.el
index 50458353970..0c411dab7a5 100644
--- a/lisp/case-table.el
+++ b/lisp/case-table.el
@@ -27,7 +27,9 @@
 
 ;;; Code:
 
-(defvar set-case-syntax-set-multibyte nil)
+;; Temporary workaround for loading latin-X.el.  They must bind this
+;; variable to a charset to convert code points to characters.
+(defvar set-case-syntax-charset nil)
 
 (defun describe-buffer-case-table ()
   "Describe the case table of the current buffer."
@@ -64,12 +66,20 @@
     (set-char-table-extra-slot copy 2 nil)
     copy))
 
+(defun set-case-syntax-1 (code)
+  (if (and (charsetp set-case-syntax-charset)
+           (< code 256))
+      (decode-char set-case-syntax-charset code)
+    code))
+
 (defun set-case-syntax-delims (l r table)
   "Make characters L and R a matching pair of non-case-converting delimiters.
 This sets the entries for L and R in TABLE, which is a string
 that will be used as the downcase part of a case table.
 It also modifies `standard-syntax-table' to
 indicate left and right delimiters."
+  (setq l (set-case-syntax-1 l))
+  (setq r (set-case-syntax-1 r))
   (aset table l l)
   (aset table r r)
   ;; Clear out the extra slots so that they will be
@@ -88,6 +98,8 @@ This sets the entries for characters UC and LC in TABLE, which is a string
 that will be used as the downcase part of a case table.
 It also modifies `standard-syntax-table' to give them the syntax of
 word constituents."
+  (setq uc (set-case-syntax-1 uc))
+  (setq lc (set-case-syntax-1 lc))
   (aset table uc lc)
   (aset table lc lc)
   (set-char-table-extra-slot table 0 nil)
@@ -102,6 +114,7 @@ This sets the entry for character C in TABLE, which is a string
 that will be used as the downcase part of a case table.
 It also modifies `standard-syntax-table'.
 SYNTAX should be \" \", \"w\", \".\" or \"_\"."
+  (setq c (set-case-syntax-1 c))
   (aset table c c)
   (set-char-table-extra-slot table 0 nil)
   (set-char-table-extra-slot table 1 nil)