diff options
| author | Glenn Morris | 2013-01-24 20:41:39 -0800 |
|---|---|---|
| committer | Glenn Morris | 2013-01-24 20:41:39 -0800 |
| commit | 830e46e61ba1316e771c72a15e709d3d12e150b7 (patch) | |
| tree | c88c21c32f65dc77d8f76c315a41a519a585dc8f /lisp/xml.el | |
| parent | 3d4147bae3f03502acb3d12a5c9747129cc0c6aa (diff) | |
| parent | 345f866e048bdc11bc38d894a7eaaa47335443e2 (diff) | |
| download | emacs-830e46e61ba1316e771c72a15e709d3d12e150b7.tar.gz emacs-830e46e61ba1316e771c72a15e709d3d12e150b7.zip | |
Merge from emacs-24; up to 2012-12-11T18:52:31Z!monnier@iro.umontreal.ca
Diffstat (limited to 'lisp/xml.el')
| -rw-r--r-- | lisp/xml.el | 2 |
1 files changed, 1 insertions, 1 deletions
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 ';' |