(term-emulate-terminal): Decode substring just prior to

inserting it, i.e. revert part of the 2008-09-24 change. (Bug#1469)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5cda871b6e635836428d7351e9a572bf3694778f..20b3e91c0a15320c369e834936b3ffd64fa66d33 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-12-27  Nicholas Maniscalco <nicholas@maniscalco.com>  (tiny change)
+
+       * term.el (term-emulate-terminal): Decode substring just prior to
+       inserting it, i.e. revert part of the 2008-09-24 change. (Bug#1469)
+
 2008-12-27  Eli Zaretskii  <eliz@gnu.org>
 
        * makefile.w32-in (MH_E_DIR): New variable.

diff --git a/lisp/term.el b/lisp/term.el
index c459e65faf40f1b04e9d1e8ebb2777fa137f1439..bdb2f18bf7f94f8c33ecf7011093a6fd04e9b8f4 100644 (file)
--- a/lisp/term.el
+++ b/lisp/term.el
@@ -2834,7 +2834,7 @@ See `term-prompt-regexp'."
                          ;; following point if not eob nor insert-mode.
                          (let ((old-column (current-column))
                                columns pos)
-                           (insert decoded-substring)
+                           (insert (decode-coding-string (substring str i funny) locale-coding-system))
                            (setq term-current-column (current-column)
                                  columns (- term-current-column old-column))
                            (when (not (or (eobp) term-insert-mode))