diff options
| author | Chong Yidong | 2013-01-23 14:25:50 +0800 |
|---|---|---|
| committer | Chong Yidong | 2013-01-23 14:25:50 +0800 |
| commit | 4d4ddaa78c15716a93f790b11e9879d73db5e7d9 (patch) | |
| tree | 4f52dd128b881295ebcb22ea18db7d54dc7a2d1f | |
| parent | 81abbb95448708ac28485d469e3b04749d1b8b08 (diff) | |
| download | emacs-4d4ddaa78c15716a93f790b11e9879d73db5e7d9.tar.gz emacs-4d4ddaa78c15716a93f790b11e9879d73db5e7d9.zip | |
* 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.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/xml.el | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7be8224ae65..eee7700446a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2013-01-23 Chong Yidong <cyd@gnu.org> | ||
| 2 | |||
| 3 | * xml.el (xml-entity-or-char-ref-re): Fix regexp. | ||
| 4 | |||
| 1 | 2013-01-18 Leo Liu <sdl.web@gmail.com> | 5 | 2013-01-18 Leo Liu <sdl.web@gmail.com> |
| 2 | 6 | ||
| 3 | * dired.el (dired-get-marked-files): Prune erroneous values due to | 7 | * 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'." | |||
| 200 | ;; [68] EntityRef ::= '&' Name ';' | 200 | ;; [68] EntityRef ::= '&' Name ';' |
| 201 | (defconst xml-entity-ref (concat "&" xml-name-re ";")) | 201 | (defconst xml-entity-ref (concat "&" xml-name-re ";")) |
| 202 | 202 | ||
| 203 | (defconst xml-entity-or-char-ref-re (concat "&\\(?:#\\(x\\)?\\([0-9]+\\)\\|\\(" | 203 | (defconst xml-entity-or-char-ref-re (concat "&\\(?:#\\(x\\)?\\([0-9a-fA-F]+\\)\\|\\(" |
| 204 | xml-name-re "\\)\\);")) | 204 | xml-name-re "\\)\\);")) |
| 205 | 205 | ||
| 206 | ;; [69] PEReference ::= '%' Name ';' | 206 | ;; [69] PEReference ::= '%' Name ';' |