From: Mark A. Hershberger <mah@everybody.org>
Date: Thu, 17 Jan 2008 17:21:34 +0000 (+0000)
Subject: * xml.el (xml-escape-string): Don't do any encoding changes on the string.
X-Git-Tag: emacs-pretest-23.0.90~8295^2~32
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=76a6127f0ec0c0f2b3082ad28b036d9c7f981726;p=emacs.git

* xml.el (xml-escape-string): Don't do any encoding changes on the string.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e8b138c1787..bb1d32d66bf 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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
diff --git a/lisp/xml.el b/lisp/xml.el
index 405375fb89e..f2bcf86b5e7 100644
--- a/lisp/xml.el
+++ b/lisp/xml.el
@@ -852,10 +852,9 @@ xml-entity-alist."
                  (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.