X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/383669afbb34d15b1f492ec58a9bac51ec6b43b7..4be9beaf4e4120f67dbf525a84789525bfef2ef8:/lisp/case-table.el

diff --git a/lisp/case-table.el b/lisp/case-table.el
index 46f1d8b0f4..79cc96b5b3 100644
--- a/lisp/case-table.el
+++ b/lisp/case-table.el
@@ -19,8 +19,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to
-;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
 
 ;;; Commentary:
 
@@ -33,62 +34,96 @@
 
 ;;; Code:
 
-;;;###autoload
+(defvar set-case-syntax-offset 0)
+
+(defvar set-case-syntax-set-multibyte nil)
+
 (defun describe-buffer-case-table ()
   "Describe the case table of the current buffer."
   (interactive)
-  (let ((vector (make-vector 256 nil))
-	(ch 0))
-    (while (< ch 256)
-      (aset vector ch
-	    (cond ((/= ch (downcase ch))
-		   (concat "uppercase, matches "
-			   (char-to-string (downcase ch))))
-		  ((/= ch (upcase ch))
-		   (concat "lowercase, matches "
-			   (char-to-string (upcase ch))))
-		  (t "case-invariant")))
-      (setq ch (1+ ch)))
+  (let ((description (make-char-table 'case-table)))
+    (map-char-table
+     (function (lambda (key value)
+		 (aset
+		  description key
+		  (cond ((not (natnump value))
+			 "case-invariant")
+			((/= key (downcase key))
+			 (concat "uppercase, matches "
+				 (char-to-string (downcase key))))
+			((/= key (upcase key))
+			 (concat "lowercase, matches "
+				 (char-to-string (upcase key))))
+			(t "case-invariant")))))
+     (current-case-table))
     (save-excursion
      (with-output-to-temp-buffer "*Help*"
        (set-buffer standard-output)
-       (describe-vector vector)
+       (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
+    ;; recomputed from the main (downcase) table.
+    (set-char-table-extra-slot copy 0 nil)
+    (set-char-table-extra-slot copy 1 nil)
+    (set-char-table-extra-slot copy 2 nil)
+    copy))
+
+(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-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
+  ;; recomputed from the main (downcase) table.
+  (set-char-table-extra-slot table 0 nil)
+  (set-char-table-extra-slot table 1 nil)
+  (set-char-table-extra-slot table 2 nil)
   (modify-syntax-entry l (concat "(" (char-to-string r) "  ")
 		       (standard-syntax-table))
   (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-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)
+  (set-char-table-extra-slot table 1 nil)
+  (set-char-table-extra-slot table 2 nil)
   (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 characters C case-invariant with syntax SYNTAX.
-This sets the entries for character C in TABLE, which is a string
+  "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-1 c))
   (aset table c c)
+  (set-char-table-extra-slot table 0 nil)
+  (set-char-table-extra-slot table 1 nil)
+  (set-char-table-extra-slot table 2 nil)
   (modify-syntax-entry c syntax (standard-syntax-table)))
 
 (provide 'case-table)