[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r117140: * lisp/shell.el (shell-mode) <shell-dirstac
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] trunk r117140: * lisp/shell.el (shell-mode) <shell-dirstack-query>: Bypass bash aliases. |
Date: |
Thu, 22 May 2014 19:56:52 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 117140
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Thu 2014-05-22 15:56:49 -0400
message:
* lisp/shell.el (shell-mode) <shell-dirstack-query>: Bypass bash aliases.
modified:
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/shell.el shell.el-20091113204419-o5vbwnq5f7feedwu-150
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2014-05-21 01:55:54 +0000
+++ b/lisp/ChangeLog 2014-05-22 19:56:49 +0000
@@ -1,3 +1,7 @@
+2014-05-22 Glenn Morris <address@hidden>
+
+ * shell.el (shell-mode) <shell-dirstack-query>: Bypass bash aliases.
+
2014-05-21 Daniel Colascione <address@hidden>
* files.el (interpreter-mode-alist): Add mksh.
=== modified file 'lisp/shell.el'
--- a/lisp/shell.el 2014-04-07 01:27:32 +0000
+++ b/lisp/shell.el 2014-05-22 19:56:49 +0000
@@ -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 <address@hidden>
;; Simon Marshall <address@hidden>
@@ -584,6 +583,8 @@
(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")
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r117140: * lisp/shell.el (shell-mode) <shell-dirstack-query>: Bypass bash aliases.,
Glenn Morris <=