Merge from trunk

[bpt/emacs.git] / lisp / case-table.el

diff --git a/lisp/case-table.el b/lisp/case-table.el
index 10b6af5..a1bb862 100644 (file)
--- a/lisp/case-table.el
+++ b/lisp/case-table.el
@@ -1,18 +1,18 @@
 ;;; case-table.el --- code to extend the character set and support case tables
 
-;; Copyright (C) 1988, 1994, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007 Free Software Foundation, Inc.
+;; Copyright (C) 1988, 1994, 2001-2011 Free Software Foundation, Inc.
 
 ;; Author: Howard Gayle
 ;; Maintainer: FSF
 ;; Keywords: i18n
+;; Package: emacs
 
 ;; This file is part of GNU Emacs.
 
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -20,9 +20,7 @@
 ;; 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, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -41,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*"
@@ -170,5 +174,4 @@ SYNTAX should be \" \", \"w\", \".\" or \"_\"."
 
 (provide 'case-table)
 
-;;; arch-tag: 3c2cf885-2c9a-449a-9972-2e269191896d
 ;;; case-table.el ends here