(describe-buffer-case-table): Fix for the case that KEY is a cons.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7c1ca342714586626d3df2976dc3a6b430e98b92..4abca12e2eedab5fc67500e7e9feb935125deb1f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-07-17  Kenichi Handa  <handa@m17n.org>
+
+       * case-table.el (describe-buffer-case-table): Fix for the case
+       that KEY is a cons.
+
 2009-07-16  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
        * term/ns-win.el (ns-set-alpha): Don't declare.

diff --git a/lisp/case-table.el b/lisp/case-table.el
index 34e4fc7824c72ac48f0ba9dd395aaf8728725808..32df0c2ab32902c6c584a4faff8683d9932f621d 100644 (file)
--- a/lisp/case-table.el
+++ b/lisp/case-table.el
@@ -39,19 +39,25 @@
   (let ((description (make-char-table 'case-table)))
     (map-char-table
      (function (lambda (key value)
-                (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"))))))
+                (if (not (natnump value))
+                    (if (consp key)
+                        (set-char-table-range description key "case-invariant")
+                      (aset description key "case-invariant"))
+                  (let (from to)
+                    (if (consp key)
+                        (setq from (car key) to (cdr key))
+                      (setq from (setq to key)))
+                    (while (<= from to)
+                      (aset
+                       description from
+                       (cond ((/= from (downcase from))
+                              (concat "uppercase, matches "
+                                      (char-to-string (downcase from))))
+                             ((/= from (upcase from))
+                              (concat "lowercase, matches "
+                                      (char-to-string (upcase from))))
+                             (t "case-invariant")))
+                      (setq from (1+ from)))))))
      (current-case-table))
     (save-excursion
      (with-output-to-temp-buffer "*Help*"