X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/b9345dfd4b5479ec624f1870723a8ea5c9c719e7..758c81e87ded2bad9f5a5a6683fb498965eb508c:/lisp/xml.el?ds=sidebyside

diff --git a/lisp/xml.el b/lisp/xml.el
index 52bb0de7ea..cb56f023af 100644
--- a/lisp/xml.el
+++ b/lisp/xml.el
@@ -1,6 +1,6 @@
 ;;; xml.el --- XML parser
 
-;; Copyright (C) 2000-2011 Free Software Foundation, Inc.
+;; Copyright (C) 2000-2012 Free Software Foundation, Inc.
 
 ;; Author: Emmanuel Briot  <briot@gnat.com>
 ;; Maintainer: Mark A. Hershberger <mah@everybody.org>
@@ -323,7 +323,8 @@ If PARSE-NS is non-nil, then QNAMES are expanded."
 		  (cond
 		   ((null result)
 		    ;; Not looking at an xml start tag.
-		    (forward-char 1))
+		    (unless (eobp)
+		      (forward-char 1)))
 		   ((and xml (not xml-sub-parser))
 		    ;; Translation of rule [1] of XML specifications
 		    (error "XML: (Not Well-Formed) Only one root tag allowed"))
@@ -421,7 +422,9 @@ Returns one of:
      ;;  skip comments
      ((looking-at "<!--")
       (search-forward "-->")
-      nil)
+      (skip-syntax-forward " ")
+      (unless (eobp)
+	(xml-parse-tag parse-dtd xml-ns)))
      ;;  end tag
      ((looking-at "</")
       '())
@@ -540,7 +543,7 @@ Leave point at the first non-blank character after the tag."
 	(replace-regexp-in-string "\\s-\\{2,\\}" " " string)
 	(let ((expansion (xml-substitute-special string)))
 	  (unless (stringp expansion)
-					; We say this is the constraint.  It is acctually that
+					; We say this is the constraint.  It is actually that neither
 					; external entities nor "<" can be in an attribute value.
 	    (error "XML: (Not Well-Formed) Entities in attributes cannot expand into elements"))
 	  (push (cons name expansion) attlist)))
@@ -756,7 +759,7 @@ This follows the rule [28] in the XML specifications."
 ;;*******************************************************************
 
 (defun xml-substitute-special (string)
-  "Return STRING, after subsituting entity references."
+  "Return STRING, after substituting entity references."
   ;; This originally made repeated passes through the string from the
   ;; beginning, which isn't correct, since then either "&amp;amp;" or
   ;; "&#38;amp;" won't DTRT.