1 files changed, 33 insertions, 30 deletions

diff --git a/lisp/nxml/nxml-uchnm.el b/lisp/nxml/nxml-uchnm.el
index 62f46c5ad5d..892a81e04ac 100644
--- a/lisp/nxml/nxml-uchnm.el
+++ b/lisp/nxml/nxml-uchnm.el
@@ -1,24 +1,26 @@
 ;;; nxml-uchnm.el --- support for Unicode standard cha names in nxml-mode
 
-;; Copyright (C) 2003 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2007 Free Software Foundation, Inc.
 
 ;; Author: James Clark
 ;; Keywords: XML
 
-;; This program 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 2 of
-;; the License, or (at your option) any later version.
+;; This file is part of GNU Emacs.
 
-;; This program is distributed in the hope that it will be
-;; useful, but WITHOUT ANY WARRANTY; without even the implied
-;; warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;; PURPOSE.  See the GNU General Public License for more details.
+;; 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.
 
-;; You should have received a copy of the GNU General Public
-;; License along with this program; if not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-;; MA 02111-1307 USA
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; 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.
 
 ;;; Commentary:
 
@@ -202,16 +204,16 @@ by a hyphen."
   "Default value for `nxml-enabled-unicode-blocks'.")
 
 (let ((dir (file-name-directory load-file-name)))
-  (mapcar (lambda (block)
-            (let ((sym (nxml-unicode-block-char-name-set (car block))))
-              (nxml-autoload-char-name-set
-               sym
-               (expand-file-name
-                (format "char-name/unicode/%05X-%05X"
-                        (nth 1 block)
-                        (nth 2 block))
-                dir))))
-          nxml-unicode-blocks))
+  (mapc (lambda (block)
+          (let ((sym (nxml-unicode-block-char-name-set (car block))))
+            (nxml-autoload-char-name-set
+             sym
+             (expand-file-name
+              (format "char-name/unicode/%05X-%05X"
+                      (nth 1 block)
+                      (nth 2 block))
+              dir))))
+        nxml-unicode-blocks))
 
 (defvar nxml-enable-unicode-char-name-sets-flag nil)
 
@@ -219,6 +221,7 @@ by a hyphen."
   "List of Unicode blocks for which Unicode character names are enabled.
 Each block is identified by a symbol derived from the name
 of the block by downcasing and replacing each space by a hyphen."
+  :group 'nxml
   :set (lambda (sym value)
          (set-default 'nxml-enabled-unicode-blocks value)
          (when nxml-enable-unicode-char-name-sets-flag
@@ -244,13 +247,13 @@ the variable `nxml-enabled-unicode-blocks'."
   (nxml-enable-unicode-char-name-sets-1))
 
 (defun nxml-enable-unicode-char-name-sets-1 ()
-  (mapcar (lambda (block)
-            (nxml-disable-char-name-set
-             (nxml-unicode-block-char-name-set (car block))))
-          nxml-unicode-blocks)
-  (mapcar (lambda (nameset)
-            (nxml-enable-char-name-set nameset))
-          nxml-enabled-unicode-blocks))
+  (mapc (lambda (block)
+          (nxml-disable-char-name-set
+           (nxml-unicode-block-char-name-set (car block))))
+        nxml-unicode-blocks)
+  (mapc (lambda (nameset)
+          (nxml-enable-char-name-set nameset))
+        nxml-enabled-unicode-blocks))
 
 (provide 'nxml-uchnm)