procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

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

Fixes: debbugs:11286
This commit is contained in:
Chong Yidong 2012-04-21 17:53:37 +08:00
parent 7b9946cfd9
commit 18edb22d4f
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -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.

6
lisp/xml.el
View file

@ -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 "</")
'())