diff options
| author | Matt Armstrong | 2016-12-10 17:29:51 -0800 |
|---|---|---|
| committer | Glenn Morris | 2016-12-10 17:29:51 -0800 |
| commit | 8d1b753d528f741580e48d2b4a6c9b40ca06c08d (patch) | |
| tree | 7ca48590565f33df8ed81d2679059a5db0780aa3 | |
| parent | 2335b9100b47074a37079fb2c3608505eeac96b7 (diff) | |
| download | emacs-8d1b753d528f741580e48d2b4a6c9b40ca06c08d.tar.gz emacs-8d1b753d528f741580e48d2b4a6c9b40ca06c08d.zip | |
Minor shell-mode fix for zsh
* lisp/shell.el (shell-mode): Prevent shell-dirstack-query
becoming confused by zsh abbreviations. (Bug#24632)
Copyright-paperwork-exempt: yes
| -rw-r--r-- | lisp/shell.el | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lisp/shell.el b/lisp/shell.el index d1b2e875746..cabd1e5a474 100644 --- a/lisp/shell.el +++ b/lisp/shell.el | |||
| @@ -590,6 +590,7 @@ buffer." | |||
| 590 | ((string-equal shell "ksh") "echo $PWD ~-") | 590 | ((string-equal shell "ksh") "echo $PWD ~-") |
| 591 | ;; Bypass any aliases. TODO all shells could use this. | 591 | ;; Bypass any aliases. TODO all shells could use this. |
| 592 | ((string-equal shell "bash") "command dirs") | 592 | ((string-equal shell "bash") "command dirs") |
| 593 | ((string-equal shell "zsh") "dirs -l") | ||
| 593 | (t "dirs"))) | 594 | (t "dirs"))) |
| 594 | ;; Bypass a bug in certain versions of bash. | 595 | ;; Bypass a bug in certain versions of bash. |
| 595 | (when (string-equal shell "bash") | 596 | (when (string-equal shell "bash") |