Merge from emacs-23

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

diff --git a/lisp/case-table.el b/lisp/case-table.el
index 3c94db9b0a6f6d15f11afe1cd4445ff1da697a16..ab4f83e8105c0d5669b559c545ab5a7e5cb8cfb6 100644 (file)
--- a/lisp/case-table.el
+++ b/lisp/case-table.el
@@ -1,11 +1,12 @@
 ;;; case-table.el --- code to extend the character set and support case tables
 
 ;; Copyright (C) 1988, 1994, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;;   2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 
 ;; Author: Howard Gayle
 ;; Maintainer: FSF
 ;; Keywords: i18n
+;; Package: emacs
 
 ;; This file is part of GNU Emacs.
 
@@ -39,19 +40,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*"