Add 2007 to copyright years.

Switch license to standard GPLv3+ text.
(xsdre-gen-categories): Use mapc rather than mapcar.

2 files changed, 90 insertions, 39 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6ab8fa7f0eb..0572bddc9d2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,52 @@
+2007-11-28  Glenn Morris  <rgm@gnu.org>
+
+        * nxml/nxml-enc.el (xmltok-get-declared-encoding-position):
+        Declare as a function.
+
+        * nxml/nxml-maint.el (nxml-create-unicode-char-name-sets):
+        * nxml/nxml-mode.el (nxml-get-char-name, nxml-insert-named-char):
+        * nxml/xsd-regexp.el (xsdre-gen-categories): Use mapc rather than
+        mapcar.
+
+        * nxml/nxml-outln.el (nxml-token-start-tag-p)
+        (nxml-token-end-tag-p): Move definitions before use.
+
+        * nxml/nxml-rap.el (nxml-prolog-regions): Declare for compiler.
+
+        * nxml/nxml-uchnm.el (top-level)
+        (nxml-enable-unicode-char-name-sets-1): Use mapc rather than mapcar.
+        (nxml-enabled-unicode-blocks): Add custom group.
+
+        * nxml/xmltok.el (xmltok-scan-char-ref, xmltok-char-number):
+        Use string-to-number rather than string-to-int.
+
+        * dired-x.el (dired-omit-old-add-entry): Declare as function.
+        Move definition before use.
+        (dired-old-find-buffer-nocreate): Declare as function.
+
+        * emacs-lisp/check-declare.el (check-declare-locate): Reflow doc.
+        (check-declare-verify): Handle fset.
+
+        * emulation/edt.el (edt-user-emulation-setup): Test
+        edt-setup-user-bindings is bound before calling.
+
+        * emulation/tpu-edt.el: Don't require cl when compiling.
+        (tpu-emacs-search, tpu-emacs-rev-search): Declare as functions.
+        (tpu-edt-off): Use condition-case rather than ignore-errors.
+        Use with-no-warnings.
+
+        * eshell/esh-util.el (top-level): Use require rather than load for
+        ange-ftp.
+
+        * mail/supercite.el (sc-version): Redefine as an alias for
+        emacs-version.
+        (sc-help-address): Remove.
+        (sc-version): Use emacs-version rather than sc-version.
+        (sc-submit-bug-report): Redefine as an alias for report-emacs-bug.
+
+        * net/socks.el (socks-original-open-network-stream): Declare as
+        function.  Move definition before use.
+
 2007-11-28  Jay Belanger  <jay.p.belanger@gmail.com>
 
         * calc/calc-ext.el (math-sqrt-raw, math-map-vec)
diff --git a/lisp/nxml/xsd-regexp.el b/lisp/nxml/xsd-regexp.el
index 6dbb6a74dd8..a698ce71e60 100644
--- a/lisp/nxml/xsd-regexp.el
+++ b/lisp/nxml/xsd-regexp.el
@@ -1,24 +1,26 @@
 ;;; xsd-regexp.el --- translate W3C XML Schema regexps to Emacs regexps
 
-;; Copyright (C) 2003 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2007 Free Software Foundation, Inc.
 
 ;; Author: James Clark
 ;; Keywords: XML, regexp
 
-;; 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:
 
@@ -713,7 +715,7 @@ Code is inserted into the current buffer."
   (save-excursion
     (set-buffer (find-file-noselect file))
     (goto-char (point-min))
-    (mapcar (lambda (x) (put x 'xsdre-ranges nil)) xsdre-gen-categories)
+    (mapc (lambda (x) (put x 'xsdre-ranges nil)) xsdre-gen-categories)
     (while (re-search-forward "^\\([0-9A-Fa-f]*\\);[^;]*;\\([A-Z][a-z]\\);"
                               nil
                               t)
@@ -742,31 +744,31 @@ Code is inserted into the current buffer."
                           (cdr ranges))))
               (t
                (put sym 'xsdre-ranges (cons code ranges))))))
-    (mapcar (lambda (x)
-              (put x
-                   'xsdre-ranges
-                   (nreverse (get x 'xsdre-ranges)))
-              nil)
-            xsdre-gen-categories))
-  (mapcar (lambda (x)
-            (let ((start (point)))
-              (pp (list 'xsdre-def-primitive-category
-                        (list 'quote x)
-                        (list 'quote (get x 'xsdre-ranges)))
-                  (current-buffer))
-              (save-excursion
-                (goto-char start)
-                (down-list 2)
-                (while (condition-case err
-                           (progn 
-                             (forward-sexp)
-                             t)
-                         (error nil))
-                  (when (and (< 70 (current-column))
-                             (not (looking-at ")")))
-                    (insert "\n")
-                    (lisp-indent-line))))))
-          xsdre-gen-categories))
+    (mapc (lambda (x)
+            (put x
+                 'xsdre-ranges
+                 (nreverse (get x 'xsdre-ranges)))
+            nil)
+          xsdre-gen-categories))
+  (mapc (lambda (x)
+          (let ((start (point)))
+            (pp (list 'xsdre-def-primitive-category
+                      (list 'quote x)
+                      (list 'quote (get x 'xsdre-ranges)))
+                (current-buffer))
+            (save-excursion
+              (goto-char start)
+              (down-list 2)
+              (while (condition-case err
+                         (progn 
+                           (forward-sexp)
+                           t)
+                       (error nil))
+                (when (and (< 70 (current-column))
+                           (not (looking-at ")")))
+                  (insert "\n")
+                  (lisp-indent-line))))))
+        xsdre-gen-categories))
 
 (defun xsdre-def-primitive-category (sym ranges)
   (put sym 'xsdre-ranges ranges)