procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Glenn Morris 2014-05-22 15:56:49 -04:00
parent 74fde0f44f
commit aad6519233
2 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lisp/ChangeLog
View file

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

5
lisp/shell.el
View file

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