diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-04-19 07:46:13 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-04-19 07:46:13 -0700 |
| commit | 0a20c80c9cee34a71b975bb37ac811bd339eaf9f (patch) | |
| tree | 5dc019993c292129df8916c61ed608f0094b7b37 /lisp/shell.el | |
| parent | ec8df74431a76616a83806e1c1f4a094731a3f77 (diff) | |
| parent | 06b605171f1c9d8b42bd3326a243b8b03d2e4e58 (diff) | |
| download | emacs-0a20c80c9cee34a71b975bb37ac811bd339eaf9f.tar.gz emacs-0a20c80c9cee34a71b975bb37ac811bd339eaf9f.tar.bz2 emacs-0a20c80c9cee34a71b975bb37ac811bd339eaf9f.zip | |
Merge from mainline.
Diffstat (limited to 'lisp/shell.el')
| -rw-r--r-- | lisp/shell.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/shell.el b/lisp/shell.el index dde81c6cb95..57187b6d7f9 100644 --- a/lisp/shell.el +++ b/lisp/shell.el @@ -494,7 +494,7 @@ buffer." 'shell-dir-cookie-watcher nil t)) (comint-read-input-ring t))) -(defun shell-filter-ctrl-a-ctrl-b (string) +(defun shell-filter-ctrl-a-ctrl-b (_string) "Remove `^A' and `^B' characters from comint output. Bash uses these characters as internal quoting characters in its @@ -585,7 +585,7 @@ Otherwise, one argument `-i' is passed to the shell. (current-buffer))) ;; On remote hosts, the local `shell-file-name' might be useless. - (if (and (interactive-p) + (if (and (called-interactively-p 'any) (file-remote-p default-directory) (null explicit-shell-file-name) (null (getenv "ESHELL"))) @@ -692,7 +692,7 @@ and `shell-pushd-dunique' control the behavior of the relevant command. Environment variables are expanded, see function `substitute-in-file-name'." (if shell-dirtrackp ;; We fail gracefully if we think the command will fail in the shell. - (condition-case chdir-failure + (condition-case nil (let ((start (progn (string-match (concat "^" shell-command-separator-regexp) str) ; skip whitespace |