procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge from trunk

Browse source
This commit is contained in:
Joakim Verona 2013-09-13 15:36:32 +02:00
commit 9de87b9a2f
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
2013-09-13 Eli Zaretskii <eliz@gnu.org>
* term.el (term-emulate-terminal): Decode the command string
before passing it to term-command-hook. (Bug#15337)
2013-09-13 Glenn Morris <rgm@gnu.org>
* eshell/esh-util.el (ange-cache): Move declaration earlier.

6
lisp/term.el
View file

@ -2937,8 +2937,10 @@ See `term-prompt-regexp'."
(let ((end (string-match "\r?$" str i)))
(if end
(funcall term-command-hook
(prog1 (substring str (1+ i) end)
(setq i (match-end 0))))
(decode-coding-string
(prog1 (substring str (1+ i) end)
(setq i (match-end 0)))
locale-coding-system))
(setq term-terminal-parameter (substring str i))
(setq term-terminal-state 4)
(setq i str-length))))