Mercurial > emacs

changeset 91342:3ec2fe8547cf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* xml.el (xml-escape-string): Don't do any encoding changes on the string.
author Mark A. Hershberger <mah@everybody.org>
date Thu, 17 Jan 2008 17:21:34 +0000
parents 32713ca056cd
children 347746964570
files lisp/ChangeLog lisp/xml.el
diffstat 2 files changed, 8 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Wed Jan 16 02:31:34 2008 +0000
+++ b/lisp/ChangeLog	Thu Jan 17 17:21:34 2008 +0000
@@ -1,3 +1,8 @@
+2008-01-17  Mark A. Hershberger  <mah@everybody.org>
+
+	* xml.el (xml-escape-string): Don't do any encoding changes on the
+	string.
+
 2008-01-08  Nick Roberts  <nickrob@snap.net.nz>
 
 	* progmodes/gdb-ui.el (gdb-var-list-children-1): Put varnum in
--- a/lisp/xml.el	Wed Jan 16 02:31:34 2008 +0000
+++ b/lisp/xml.el	Thu Jan 17 17:21:34 2008 +0000
@@ -852,10 +852,9 @@
                  (if (rassoc char xml-entity-alist)
                      (concat "&" (car (rassoc char xml-entity-alist)) ";")
                    char)))
-             (if (multibyte-string-p string)
-                 (encode-coding-string string 'utf-8)
-               string)
-             ""))
+             ;; This differs from the non-unicode branch.  Just
+             ;; grabbing the string works here.
+             string ""))
 
 (defun xml-debug-print-internal (xml indent-string)
   "Outputs the XML tree in the current buffer.