summaryrefslogtreecommitdiff
path: root/lisp/shell.el
diff options
context:
space:
mode:
authorMatt Armstrong <marmstrong@google.com>2016-12-10 17:29:51 -0800
committerGlenn Morris <rgm@gnu.org>2016-12-10 17:29:51 -0800
commit8d1b753d528f741580e48d2b4a6c9b40ca06c08d (patch)
tree7ca48590565f33df8ed81d2679059a5db0780aa3 /lisp/shell.el
parent2335b9100b47074a37079fb2c3608505eeac96b7 (diff)
downloademacs-8d1b753d528f741580e48d2b4a6c9b40ca06c08d.tar.gz
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
Diffstat (limited to 'lisp/shell.el')
-rw-r--r--lisp/shell.el1
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."
((string-equal shell "ksh") "echo $PWD ~-")
;; Bypass any aliases. TODO all shells could use this.
((string-equal shell "bash") "command dirs")
+ ((string-equal shell "zsh") "dirs -l")
(t "dirs")))
;; Bypass a bug in certain versions of bash.
(when (string-equal shell "bash")