From: Matt Armstrong <marmstrong@google.com>
Date: Sun, 11 Dec 2016 01:29:51 +0000 (-0800)
Subject: Minor shell-mode fix for zsh
X-Git-Tag: emacs-26.0.90~1140
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8d1b753d528f741580e48d2b4a6c9b40ca06c08d;p=emacs.git

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
---

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")