diff options
author | Glenn Morris <rgm@gnu.org> | 2014-05-22 15:56:49 -0400 |
---|---|---|
committer | Glenn Morris <rgm@gnu.org> | 2014-05-22 15:56:49 -0400 |
commit | aad65192332dfc4a1df0cd2953554c21da243b51 (patch) | |
tree | e6e2fd99e7d198a76cd43b8d59cb53597ac31f01 /lisp/shell.el | |
parent | 74fde0f44f68a14d920db4d24626984e2964368d (diff) | |
download | emacs-aad65192332dfc4a1df0cd2953554c21da243b51.tar.gz |
* lisp/shell.el (shell-mode) <shell-dirstack-query>: Bypass bash aliases.
Diffstat (limited to 'lisp/shell.el')
-rw-r--r-- | lisp/shell.el | 5 |
1 files changed, 3 insertions, 2 deletions
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") |