summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorAlex Harsanyi <harsanyi@mac.com>2012-01-27 16:46:10 +0800
committerChong Yidong <cyd@gnu.org>2012-01-27 16:46:10 +0800
commita268160b063e99a515fb4356ffd2db1c73ada2b6 (patch)
tree2665f319fcba412b280787be32b99aa84691d359 /lisp
parent9f40220d8e86c83567e168b93242f0a28c2675e5 (diff)
downloademacs-a268160b063e99a515fb4356ffd2db1c73ada2b6.tar.gz
* xml.el (xml-parse-tag): Fix parsing of comments.
Fixes: debbugs:10405
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/xml.el3
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 02884f7774f..571a5e284a2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2012-01-27 Alex Harsanyi <harsanyi@mac.com>
+
+ * xml.el (xml-parse-tag): Fix parsing of comments (Bug#10405).
+
2012-01-26 Glenn Morris <rgm@gnu.org>
* dired-x.el (dired-bind-jump): Use ctl-x-map and ctl-x-4-map.
diff --git a/lisp/xml.el b/lisp/xml.el
index f7b54048d3a..39a8da0f337 100644
--- a/lisp/xml.el
+++ b/lisp/xml.el
@@ -421,7 +421,8 @@ Returns one of:
;; skip comments
((looking-at "<!--")
(search-forward "-->")
- nil)
+ (skip-syntax-forward " ")
+ (xml-parse-tag parse-dtd xml-ns))
;; end tag
((looking-at "</")
'())