From: Chong Yidong <cyd@gnu.org>
Date: Wed, 23 Jan 2013 06:25:50 +0000 (+0800)
Subject: * xml.el (xml-entity-or-char-ref-re): Fix regexp.
X-Git-Tag: emacs-24.2.93~38
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4d4ddaa78c15716a93f790b11e9879d73db5e7d9;p=emacs.git

* 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 7be8224ae65..eee7700446a 100644
--- 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 b6c37612ab3..2232746f02a 100644
--- 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 ';'