[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 28e0004: * lisp/shell.el (explicit-shell-file-name)
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] master 28e0004: * lisp/shell.el (explicit-shell-file-name): Mention shell-file-name |
Date: |
Fri, 4 Aug 2017 00:05:05 -0400 (EDT) |
branch: master
commit 28e000435e1dfdc071cd4b68afe8514dcf9b3aa2
Author: Stefan Monnier <address@hidden>
Commit: Stefan Monnier <address@hidden>
* lisp/shell.el (explicit-shell-file-name): Mention shell-file-name
* lisp/files.el (insert-directory): Don't hardcode "-c".
* lisp/term.el (term, ansi-term): Use shell-file-name.
---
lisp/files.el | 2 +-
lisp/shell.el | 4 +++-
lisp/term.el | 6 ++----
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/lisp/files.el b/lisp/files.el
index 96647fb..89f6f9f 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -6701,7 +6701,7 @@ normally equivalent short `-D' option is just passed on to
;; See eg dired-safe-switches-p.
(call-process
shell-file-name nil t nil
- "-c"
+ shell-command-switch
(concat (if (memq system-type '(ms-dos windows-nt))
""
"\\") ; Disregard Unix shell aliases!
diff --git a/lisp/shell.el b/lisp/shell.el
index c5e5cbb..ea7f0be 100644
--- a/lisp/shell.el
+++ b/lisp/shell.el
@@ -264,7 +264,9 @@ see the function `dirtrack-mode'."
:group 'shell-directories)
(defcustom explicit-shell-file-name nil
- "If non-nil, is file name to use for explicitly requested inferior shell."
+ "If non-nil, is file name to use for explicitly requested inferior shell.
+When nil, such interactive shell sessions fallback to using either
+the shell specified in $ESHELL or in `shell-file-name'."
:type '(choice (const :tag "None" nil) file)
:group 'shell)
diff --git a/lisp/term.el b/lisp/term.el
index 063a6ea..5eb7b3e 100644
--- a/lisp/term.el
+++ b/lisp/term.el
@@ -1354,8 +1354,7 @@ commands to use in that buffer.
(interactive (list (read-from-minibuffer "Run program: "
(or explicit-shell-file-name
(getenv "ESHELL")
- (getenv "SHELL")
- "/bin/sh"))))
+ shell-file-name))))
(set-buffer (make-term "terminal" program))
(term-mode)
(term-char-mode)
@@ -4149,8 +4148,7 @@ the process. Any more args are arguments to PROGRAM."
(interactive (list (read-from-minibuffer "Run program: "
(or explicit-shell-file-name
(getenv "ESHELL")
- (getenv "SHELL")
- "/bin/sh"))))
+ shell-file-name))))
;; Pick the name of the new buffer.
(setq term-ansi-buffer-name
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 28e0004: * lisp/shell.el (explicit-shell-file-name): Mention shell-file-name,
Stefan Monnier <=