emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] master 8702773: Support Bash Ctrl-Z indication of director


From: Eli Zaretskii
Subject: [Emacs-diffs] master 8702773: Support Bash Ctrl-Z indication of directory name in term.el
Date: Fri, 27 Jan 2017 09:28:31 +0000 (UTC)

branch: master
commit 87027734e99c1fc4ad7803421e1086e3388d20f3
Author: Michael Hoffman <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    Support Bash Ctrl-Z indication of directory name in term.el
    
    * term.el (term-emulate-terminal): Do not display ?\032 escape
    codes even when 'handled-ansi-message' is non-nil.  (Bug#11919)
    
    Copyright-paperwork-exempt: yes
---
 lisp/term.el |   15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/lisp/term.el b/lisp/term.el
index 5259571..063a6ea 100644
--- a/lisp/term.el
+++ b/lisp/term.el
@@ -2901,15 +2901,16 @@ See `term-prompt-regexp'."
                         ((eq char ?\017))     ; Shift In - ignored
                         ((eq char ?\^G) ;; (terminfo: bel)
                          (beep t))
-                        ((and (eq char ?\032)
-                               (not handled-ansi-message))
+                        ((eq char ?\032)
                          (let ((end (string-match "\r?\n" str i)))
                            (if end
-                               (funcall term-command-hook
-                                        (decode-coding-string
-                                         (prog1 (substring str (1+ i) end)
-                                           (setq i (1- (match-end 0))))
-                                         locale-coding-system))
+                                (progn
+                                  (unless handled-ansi-message
+                                    (funcall term-command-hook
+                                             (decode-coding-string
+                                              (substring str (1+ i) end)
+                                              locale-coding-system)))
+                                  (setq i (1- (match-end 0))))
                              (setq term-terminal-parameter (substring str i))
                              (setq term-terminal-state 4)
                              (setq i str-length))))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]