From: Chong Yidong <cyd@gnu.org>
Date: Sun, 24 Jun 2012 15:06:24 +0000 (+0800)
Subject: * xml.el (xml-parse-tag): Corrrectly handle comment embedded in non-tag text.
X-Git-Tag: emacs-24.2.90~1199^2~369
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=772b2e2ce207fd747583aa51e3495aa37b1eede1;p=emacs.git

* xml.el (xml-parse-tag): Corrrectly handle comment embedded in non-tag text.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 569dd004f76..a03ee8228f1 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-06-24  Chong Yidong  <cyd@gnu.org>
+
+	* xml.el (xml-parse-tag): Correctly handle comment embedded in
+	non-tag text.
+
 2012-06-23  Juanma Barranquero  <lekktu@gmail.com>
 
 	* makefile.w32-in (COMPILE_FIRST): Synch with changes in 2012-06-22T21:24:54Z!monnier@iro.umontreal.ca.
diff --git a/lisp/xml.el b/lisp/xml.el
index cb56f023af0..d1e824c4ece 100644
--- a/lisp/xml.el
+++ b/lisp/xml.el
@@ -424,7 +424,8 @@ Returns one of:
       (search-forward "-->")
       (skip-syntax-forward " ")
       (unless (eobp)
-	(xml-parse-tag parse-dtd xml-ns)))
+	(let ((xml-sub-parser t))
+	  (xml-parse-tag parse-dtd xml-ns))))
      ;;  end tag
      ((looking-at "</")
       '())