* lisp/shell.el (shell-mode) <shell-dirstack-query>: Bypass bash aliases.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a27456241a3b9b29e32a412cf5d518e5032e8e3c..aaf7cb232c8f298e10a037cdf6e1d26ca26e2221 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2014-05-22  Glenn Morris  <rgm@gnu.org>
+
+       * shell.el (shell-mode) <shell-dirstack-query>: Bypass bash aliases.
+
 2014-05-21  Daniel Colascione  <dancol@dancol.org>
 
        * files.el (interpreter-mode-alist): Add mksh.

diff --git a/lisp/shell.el b/lisp/shell.el
index 9dc9a013f8b23a77dfe7c75ad434911a449bfc91..506f944094bd86a41b4e3fd49acdfb2809e54eb0 100644 (file)
--- a/lisp/shell.el
+++ b/lisp/shell.el
@@ -1,7 +1,6 @@
 ;;; shell.el --- specialized comint.el for running the shell -*- lexical-binding: t -*-
 
-;; Copyright (C) 1988, 1993-1997, 2000-2014 Free Software Foundation,
-;; Inc.
+;; Copyright (C) 1988, 1993-1997, 2000-2014 Free Software Foundation, Inc.
 
 ;; Author: Olin Shivers <shivers@cs.cmu.edu>
 ;;     Simon Marshall <simon@gnu.org>
@@ -584,6 +583,8 @@ buffer."
       (setq shell-dirstack-query
            (cond ((string-equal shell "sh") "pwd")
                  ((string-equal shell "ksh") "echo $PWD ~-")
+                 ;; Bypass any aliases.  TODO all shells could use this.
+                 ((string-equal shell "bash") "command dirs")
                  (t "dirs")))
       ;; Bypass a bug in certain versions of bash.
       (when (string-equal shell "bash")