X-Git-Url: https://git.hcoop.net/bpt/emacs.git/blobdiff_plain/a1d15b3e90794065a51431f87f82b466a5b413b1..a124b2795d51b3e5b0447ca3d6afeaf544e85f84:/lisp/case-table.el

diff --git a/lisp/case-table.el b/lisp/case-table.el
index 09cf1f56ea..c47359b24b 100644
--- a/lisp/case-table.el
+++ b/lisp/case-table.el
@@ -1,6 +1,6 @@
 ;;; case-table.el --- code to extend the character set and support case tables.
 
-;; Copyright (C) 1988 Free Software Foundation, Inc.
+;; Copyright (C) 1988, 1994 Free Software Foundation, Inc.
 
 ;; Author: Howard Gayle
 ;; Maintainer: FSF
@@ -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:
 
@@ -37,64 +38,83 @@
 (defun describe-buffer-case-table ()
   "Describe the case table of the current buffer."
   (interactive)
-  (let ((vector (make-vector 256 nil))
-	(case-table (current-case-table))
-	(i 0))
-    (while (< i 256)
-      (aset vector i 
-	    (cond ((/= ch (downcase ch))
-		   (concat "uppercase, matches "
-			   (text-char-description (downcase ch))))
-		  ((/= ch (upcase ch))
-		   (concat "lowercase, matches "
-			   (text-char-description (upcase ch))))
-		  (t "case-invariant")))
-      (setq i (1+ i)))
-    (with-output-to-temp-buffer "*Help*"
-      (describe-vector vector))))
+  (let ((description (make-char-table 'case-table)))
+    (map-char-table
+     (function (lambda (key value)
+		 (set-char-table-range
+		  description key
+		  (cond ((null key)
+			 "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 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))
+    
 ;;;###autoload
 (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', and `text-mode-syntax-table' to
+It also modifies `standard-syntax-table' to
 indicate left and right delimiters."
   (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 l (concat "(" (char-to-string r) "  ")
-		       text-mode-syntax-table)
-  (modify-syntax-entry r (concat ")" (char-to-string l) "  ")
-		       (standard-syntax-table))
   (modify-syntax-entry r (concat ")" (char-to-string l) "  ")
-		       text-mode-syntax-table))
+		       (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' and `text-mode-syntax-table'
-to indicate an (uppercase, lowercase) pair of letters."
+It also modifies `standard-syntax-table' to give them the syntax of
+word constituents."
   (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 lc "w   " text-mode-syntax-table)
-  (modify-syntax-entry uc "w   " (standard-syntax-table))
-  (modify-syntax-entry uc "w   " text-mode-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
 that will be used as the downcase part of a case table.
-It also modifies `standard-syntax-table' and `text-mode-syntax-table'.
+It also modifies `standard-syntax-table'.
 SYNTAX should be \" \", \"w\", \".\" or \"_\"."
   (aset table c c)
-  (modify-syntax-entry c syntax (standard-syntax-table))
-  (modify-syntax-entry c syntax text-mode-syntax-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 c syntax (standard-syntax-table)))
 
 (provide 'case-table)