aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Nicolaescu2008-12-27 17:57:25 +0000
committerDan Nicolaescu2008-12-27 17:57:25 +0000
commitfe3a1c1dd292fa11d6cf27c7f7ee2e60fe6844f3 (patch)
tree427a5a2d673ee097f3180919e2b22982612030e8
parentbda28f63f85748466238fe70590ec607366d8014 (diff)
downloademacs-fe3a1c1dd292fa11d6cf27c7f7ee2e60fe6844f3.tar.gz
emacs-fe3a1c1dd292fa11d6cf27c7f7ee2e60fe6844f3.zip
(term-emulate-terminal): Decode substring just prior to
inserting it, i.e. revert part of the 2008-09-24 change. (Bug#1469)
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/term.el2
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5cda871b6e6..20b3e91c0a1 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12008-12-27 Nicholas Maniscalco <nicholas@maniscalco.com> (tiny change)
2
3 * term.el (term-emulate-terminal): Decode substring just prior to
4 inserting it, i.e. revert part of the 2008-09-24 change. (Bug#1469)
5
12008-12-27 Eli Zaretskii <eliz@gnu.org> 62008-12-27 Eli Zaretskii <eliz@gnu.org>
2 7
3 * makefile.w32-in (MH_E_DIR): New variable. 8 * makefile.w32-in (MH_E_DIR): New variable.
diff --git a/lisp/term.el b/lisp/term.el
index c459e65faf4..bdb2f18bf7f 100644
--- a/lisp/term.el
+++ b/lisp/term.el
@@ -2834,7 +2834,7 @@ See `term-prompt-regexp'."
2834 ;; following point if not eob nor insert-mode. 2834 ;; following point if not eob nor insert-mode.
2835 (let ((old-column (current-column)) 2835 (let ((old-column (current-column))
2836 columns pos) 2836 columns pos)
2837 (insert decoded-substring) 2837 (insert (decode-coding-string (substring str i funny) locale-coding-system))
2838 (setq term-current-column (current-column) 2838 (setq term-current-column (current-column)
2839 columns (- term-current-column old-column)) 2839 columns (- term-current-column old-column))
2840 (when (not (or (eobp) term-insert-mode)) 2840 (when (not (or (eobp) term-insert-mode))