Fix xml.el regression introduced by 2012-01-27 change.

* lisp/xml.el (xml-parse-region, xml-parse-tag): Avoid errors due to
reaching eob.

Fixes: debbugs:11286

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8df6cbf0e1af46314ea8d8408b8f43c6accba062..04cd2f736af2b5ed0d37557a5ab5203cab90cc6b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-04-21  Chong Yidong  <cyd@gnu.org>
+
+       * xml.el (xml-parse-region, xml-parse-tag): Avoid errors due to
+       reaching eob (Bug#11286).
+
 2012-04-20  Richard Stallman  <rms@gnu.org>
 
        Fix logic for returning to and yanking from Rmail buffer.

diff --git a/lisp/xml.el b/lisp/xml.el
index 39a8da0f337862b964b416996dd93d7a76a6657f..cb56f023af060a3c43856e4ad35bbd1efca88ad1 100644 (file)
--- a/lisp/xml.el
+++ b/lisp/xml.el
@@ -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"))
@@ -422,7 +423,8 @@ Returns one of:
      ((looking-at "<!--")
       (search-forward "-->")
       (skip-syntax-forward " ")
-      (xml-parse-tag parse-dtd xml-ns))
+      (unless (eobp)
+       (xml-parse-tag parse-dtd xml-ns)))
      ;;  end tag
      ((looking-at "</")
       '())