From: Kenichi Handa Date: Fri, 17 Jul 2009 12:24:25 +0000 (+0000) Subject: (describe-buffer-case-table): Fix for the case that KEY is a cons. X-Git-Tag: emacs-23.1~51 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b21b0655f12e82e9d3ef482e0e6477ae5890a25a;p=emacs.git (describe-buffer-case-table): Fix for the case that KEY is a cons. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7c1ca342714..4abca12e2ee 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2009-07-17 Kenichi Handa + + * case-table.el (describe-buffer-case-table): Fix for the case + that KEY is a cons. + 2009-07-16 YAMAMOTO Mitsuharu * term/ns-win.el (ns-set-alpha): Don't declare. diff --git a/lisp/case-table.el b/lisp/case-table.el index 34e4fc7824c..32df0c2ab32 100644 --- 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*"