Merge from emacs--rel--22

[gnu-emacs] / lisp / progmodes / ebnf-dtd.el

diff --git a/lisp/progmodes/ebnf-dtd.el b/lisp/progmodes/ebnf-dtd.el
index 9a99f222cc86464b947aaf7d4b4fa3849c2b871e..f4c57ea281839cfb25aebe95b94c9955b84596f5 100644 (file)
--- a/lisp/progmodes/ebnf-dtd.el
+++ b/lisp/progmodes/ebnf-dtd.el
@@ -1,10 +1,10 @@
 ;;; ebnf-dtd.el --- parser for DTD (Data Type Description for XML)
 
-;; Copyright (C) 2004 Free Sofware Foundation, Inc.
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
+;;   Free Software Foundation, Inc.
 
 ;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br>
 ;; Maintainer: Vinicius Jose Latorre <viniciusjl@ig.com.br>
-;; Time-stamp: <2004/04/04 21:50:16 vinicius>
 ;; Keywords: wp, ebnf, PostScript
 ;; Version: 1.0
 
@@ -22,8 +22,8 @@
 
 ;; 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., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -1152,7 +1152,7 @@
 
 
 (defun ebnf-dtd-lex ()
-  "Lexical analyser for DTD.
+  "Lexical analyzer for DTD.
 
 Return a lexical token.
 
@@ -1181,7 +1181,7 @@ See documentation for variable `ebnf-dtd-lex'."
        'end-of-input)
        ;; error
        ((eq token 'error)
-       (error "Illegal character"))
+       (error "Invalid character"))
        ;; beginning of declaration:
        ;; <?name, <!ATTLIST, <!DOCTYPE, <!ELEMENT, <!ENTITY, <!NOTATION
        ((eq token 'less-than)
@@ -1322,7 +1322,7 @@ See documentation for variable `ebnf-dtd-lex'."
         (forward-char 3)
         t)
        (t
-        (error "Illegal character"))
+        (error "Invalid character"))
        ))