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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e8b138c178778e0b337e7a5a18a2da5b28bdad0f..bb1d32d66bff96be719b6b9a1f147c0509dfd581 100644 (file)
--- 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 405375fb89e82039d1db216b34209a474705dbd1..f2bcf86b5e7d37e86680c125328045bedfb0d12c 100644 (file)
--- 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.