From: Chong Yidong <cyd@gnu.org>
Date: Sat, 21 Apr 2012 09:53:37 +0000 (+0800)
Subject: Fix xml.el regression introduced by 2012-01-27 change.
X-Git-Tag: emacs-24.0.96~27
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=18edb22d4f484783b009d3b4420f62462025f350;p=emacs.git

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 8df6cbf0e1a..04cd2f736af 100644
--- 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 39a8da0f337..cb56f023af0 100644
--- 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 "</")
       '())