From: Glenn Morris <rgm@gnu.org>
Date: Thu, 22 May 2014 19:56:49 +0000 (-0400)
Subject: * lisp/shell.el (shell-mode) <shell-dirstack-query>: Bypass bash aliases.
X-Git-Tag: emacs-25.0.90~2640^2~68
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=aad65192332dfc4a1df0cd2953554c21da243b51;p=emacs.git

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a27456241a3..aaf7cb232c8 100644
--- 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 9dc9a013f8b..506f944094b 100644
--- 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")