]> git.eshelyaron.com Git - emacs.git/commitdiff
Support Bash Ctrl-Z indication of directory name in term.el
authorMichael Hoffman <emacs-hoffman@sneakemail.com>
Fri, 27 Jan 2017 09:26:36 +0000 (11:26 +0200)
committerEli Zaretskii <eliz@gnu.org>
Fri, 27 Jan 2017 09:26:36 +0000 (11:26 +0200)
* 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

index 5259571eb6dd257119bbe9b310b7f3832904a552..063a6ea592f5a18745895319e0796ccdca98bef7 100644 (file)
@@ -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))))