Add 2007 to copyright years.

Switch license to standard GPLv3+ text.
(nxml-get-char-name, nxml-insert-named-char): Use mapc rather than mapcar.

1 files changed, 17 insertions, 15 deletions

diff --git a/lisp/nxml/nxml-mode.el b/lisp/nxml/nxml-mode.el
index ee08fe9b222..42d16359fbc 100644
--- a/lisp/nxml/nxml-mode.el
+++ b/lisp/nxml/nxml-mode.el
@@ -1,24 +1,26 @@
 ;;; nxml-mode.el --- a new XML mode
 
-;; Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2004, 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:
 
@@ -2527,7 +2529,7 @@ is an integer giving the Unicode scalar value of the character."
   (put nameset 'nxml-char-name-set-defined t))
 
 (defun nxml-get-char-name (code)
-  (mapcar 'nxml-maybe-load-char-name-set nxml-autoload-char-name-set-list)
+  (mapc 'nxml-maybe-load-char-name-set nxml-autoload-char-name-set-list)
   (let ((names (gethash code nxml-char-name-table))
 	name)
     (while (and names (not name))
@@ -2544,7 +2546,7 @@ The name is read from the minibuffer.
 Normally, inserts the character as a numeric character reference.
 With a prefix argument, inserts the character directly."
   (interactive "*P")
-  (mapcar 'nxml-maybe-load-char-name-set nxml-autoload-char-name-set-list)
+  (mapc 'nxml-maybe-load-char-name-set nxml-autoload-char-name-set-list)
   (let ((name
 	 (let ((completion-ignore-case nxml-char-name-ignore-case))
 	   (completing-read "Character name: "