(quail-update-leim-list-file): Fix message syntax.

[gnu-emacs] / lisp / case-table.el

diff --git a/lisp/case-table.el b/lisp/case-table.el
index d34cdc37db973fd7cdaf8ff9e0bfb72352f4aa12..79cc96b5b315f1b2aff5c7ff8b0e6d2f5e6e8157 100644 (file)
--- a/lisp/case-table.el
+++ b/lisp/case-table.el
@@ -36,16 +36,17 @@
 
 (defvar set-case-syntax-offset 0)
 
-;;;###autoload
+(defvar set-case-syntax-set-multibyte nil)
+
 (defun describe-buffer-case-table ()
   "Describe the case table of the current buffer."
   (interactive)
   (let ((description (make-char-table 'case-table)))
     (map-char-table
      (function (lambda (key value)
-                (set-char-table-range
+                (aset
                  description key
-                 (cond ((null key)
+                 (cond ((not (natnump value))
                         "case-invariant")
                        ((/= key (downcase key))
                         (concat "uppercase, matches "
@@ -61,7 +62,6 @@
        (describe-vector description)
        (help-mode)))))
 
-;;;###autoload
 (defun copy-case-table (case-table)
   (let ((copy (copy-sequence case-table)))
     ;; Clear out the extra slots so that they will be
@@ -71,15 +71,20 @@
     (set-char-table-extra-slot copy 2 nil)
     copy))
 
-;;;###autoload
+(defsubst set-case-syntax-1 (char)
+  "Offset CHAR by `set-case-syntax-offset' if CHAR is a non-ASCII 8-bit char."
+  (if (and (>= char 128) (< char 256))
+      (+ char set-case-syntax-offset)
+    char))
+
 (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-offset l))
-  (setq r (+ set-case-syntax-offset r))
+  (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
@@ -92,15 +97,14 @@ indicate left and right delimiters."
   (modify-syntax-entry r (concat ")" (char-to-string l) "  ")
                       (standard-syntax-table)))
 
-;;;###autoload
 (defun set-case-syntax-pair (uc lc table)
   "Make characters UC and LC a pair of inter-case-converting letters.
 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-offset uc))
-  (setq lc (+ set-case-syntax-offset lc))
+  (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)
@@ -109,14 +113,13 @@ word constituents."
   (modify-syntax-entry lc "w   " (standard-syntax-table))
   (modify-syntax-entry uc "w   " (standard-syntax-table)))
 
-;;;###autoload
 (defun set-case-syntax (c syntax table)
   "Make character C case-invariant with syntax SYNTAX.
 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-offset c))
+  (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)