[Emacs-diffs] /srv/bzr/emacs/emacs-24 r111256: * xml.el (xml-parse-string): Fix typo in handling of bad character references.

[Chong Yidong]

------------------------------------------------------------
revno: 111256
committer: Chong Yidong <address@hidden>
branch nick: emacs-24
timestamp: Wed 2013-02-13 15:24:11 +0800
message:
  * xml.el (xml-parse-string): Fix typo in handling of bad character references.
modified:
  lisp/ChangeLog
  lisp/xml.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-02-10 10:07:09 +0000
+++ b/lisp/ChangeLog    2013-02-13 07:24:11 +0000
@@ -1,3 +1,8 @@
+2013-02-13  Chong Yidong  <address@hidden>
+
+       * xml.el (xml-parse-string): Fix typo in handling of bad character
+       references.
+
 2013-02-10  Michael Albinus  <address@hidden>
 
        * net/ange-ftp.el (ange-ftp-make-directory): Don't raise an error,

=== modified file 'lisp/xml.el'
--- a/lisp/xml.el       2013-01-23 06:25:50 +0000
+++ b/lisp/xml.el       2013-02-13 07:24:11 +0000
@@ -611,7 +611,7 @@
                   xml-validating-parser
                   (error "XML: (Validity) Invalid character reference `%s'"
                          (match-string 0)))
-             (replace-match (or (string val) xml-undefined-entity) t t))
+             (replace-match (if val (string val) xml-undefined-entity) t t))
          ;; For an entity reference, search again from the start of
          ;; the replaced text, since the replacement can contain
          ;; entity or character references, or markup.
@@ -620,7 +620,7 @@
          (and (null val)
               xml-validating-parser
               (error "XML: (Validity) Undefined entity `%s'" ref))
-         (replace-match (cdr val) t t)
+         (replace-match (or (cdr val) xml-undefined-entity) t t)
          (goto-char (match-beginning 0)))
        ;; Check for XML bombs.
        (and xml-entity-expansion-limit