diff options
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/term.el | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 014b48771c1..93156233ee1 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2013-09-13 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * term.el (term-emulate-terminal): Decode the command string | ||
| 4 | before passing it to term-command-hook. (Bug#15337) | ||
| 5 | |||
| 1 | 2013-09-13 Glenn Morris <rgm@gnu.org> | 6 | 2013-09-13 Glenn Morris <rgm@gnu.org> |
| 2 | 7 | ||
| 3 | * eshell/esh-util.el (ange-cache): Move declaration earlier. | 8 | * eshell/esh-util.el (ange-cache): Move declaration earlier. |
diff --git a/lisp/term.el b/lisp/term.el index 31889a78273..be080297b2e 100644 --- a/lisp/term.el +++ b/lisp/term.el | |||
| @@ -2937,8 +2937,10 @@ See `term-prompt-regexp'." | |||
| 2937 | (let ((end (string-match "\r?$" str i))) | 2937 | (let ((end (string-match "\r?$" str i))) |
| 2938 | (if end | 2938 | (if end |
| 2939 | (funcall term-command-hook | 2939 | (funcall term-command-hook |
| 2940 | (prog1 (substring str (1+ i) end) | 2940 | (decode-coding-string |
| 2941 | (setq i (match-end 0)))) | 2941 | (prog1 (substring str (1+ i) end) |
| 2942 | (setq i (match-end 0))) | ||
| 2943 | locale-coding-system)) | ||
| 2942 | (setq term-terminal-parameter (substring str i)) | 2944 | (setq term-terminal-parameter (substring str i)) |
| 2943 | (setq term-terminal-state 4) | 2945 | (setq term-terminal-state 4) |
| 2944 | (setq i str-length)))) | 2946 | (setq i str-length)))) |