* xml.el (xml-entity-or-char-ref-re): Fix regexp.

This bug was reported by Jae-oh Kim; it was posted to bug-gnu-emacs
but didn't show up in the bug tracker for some reason.  It is a
regression against Emacs 24.2.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7be8224ae65205943a897a526d9b25b19f08a3a2..eee7700446a961be98b03612759f974720a31cd2 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2013-01-23  Chong Yidong  <cyd@gnu.org>
+
+       * xml.el (xml-entity-or-char-ref-re): Fix regexp.
+
 2013-01-18  Leo Liu  <sdl.web@gmail.com>
 
        * dired.el (dired-get-marked-files): Prune erroneous values due to

diff --git a/lisp/xml.el b/lisp/xml.el
index b6c37612ab3660688f7ef53f7313311abb52c271..2232746f02a93bf1abc5bb90dbf98742df5e0f51 100644 (file)
--- a/lisp/xml.el
+++ b/lisp/xml.el
@@ -200,7 +200,7 @@ See also `xml-get-attribute-or-nil'."
 ;; [68] EntityRef   ::= '&' Name ';'
 (defconst xml-entity-ref (concat "&" xml-name-re ";"))
 
-(defconst xml-entity-or-char-ref-re (concat "&\\(?:#\\(x\\)?\\([0-9]+\\)\\|\\("
+(defconst xml-entity-or-char-ref-re (concat "&\\(?:#\\(x\\)?\\([0-9a-fA-F]+\\)\\|\\("
                                            xml-name-re "\\)\\);"))
 
 ;; [69] PEReference ::= '%' Name ';'