(xml-parse-dtd): Fix `error' call.

2 files changed, 6 insertions, 3 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b8023859204..b5cfa0640e9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2004-10-06  John Paul Wallington  <jpw@gnu.org>
+
+        * xml.el (xml-parse-dtd): Fix `error' call.
+
 2004-10-05  Mark A. Hershberger  <mah@everybody.org>
 
         * xml.el (xml-substitute-special): Return a single string instead
@@ -17,7 +21,6 @@
         (Info-build-toc): Don't check for special Info file names.
         Set main-file to nil if Info-find-file returns a symbol.
 
->>>>>>> 1.6421
 2004-10-05  Emilio C. Lopes  <eclig@gmx.net>:
 
         * calendar/calendar.el (calendar-goto-iso-week): Add autoload.
diff --git a/lisp/xml.el b/lisp/xml.el
index dd6d5095bc2..f1d8cbb1f00 100644
--- a/lisp/xml.el
+++ b/lisp/xml.el
@@ -598,8 +598,8 @@ This follows the rule [28] in the XML specifications."
               nil)
              (t
               (if xml-validating-parser 
-                  error "XML: (Validity) Invalid element type in the DTD")))
-
+                  (error "XML: (Validity) Invalid element type in the DTD"))))
+            
             ;;  rule [45]: the element declaration must be unique
             (if (and (assoc element dtd)
                      xml-validating-parser)