Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-66

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

diff --git a/lisp/case-table.el b/lisp/case-table.el
index 4ca99806015243bb72795e3710f3d3e699952f45..71e82bcabefa078e923241347a35e9bf8a616da8 100644 (file)
--- a/lisp/case-table.el
+++ b/lisp/case-table.el
@@ -1,4 +1,4 @@
-;;; case-table.el --- code to extend the character set and support case tables.
+;;; case-table.el --- code to extend the character set and support case tables
 
 ;; Copyright (C) 1988, 1994 Free Software Foundation, Inc.
 
@@ -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,24 +34,25 @@
 
 ;;; Code:
 
-;;;###autoload
 (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
-                 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")))))
+                (if (consp key)
+                    (set-char-table-range description key "case-invariant")
+                  (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*"
@@ -58,7 +60,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
@@ -67,8 +68,7 @@
     (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
@@ -87,7 +87,6 @@ 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
@@ -102,10 +101,9 @@ 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 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 \"_\"."
@@ -117,4 +115,5 @@ SYNTAX should be \" \", \"w\", \".\" or \"_\"."
 
 (provide 'case-table)
 
+;;; arch-tag: 3c2cf885-2c9a-449a-9972-2e269191896d
 ;;; case-table.el ends here