diff options
| author | Basil L. Contovounesios <contovob@tcd.ie> | 2020-04-17 10:27:36 +0100 |
|---|---|---|
| committer | Basil L. Contovounesios <contovob@tcd.ie> | 2020-12-03 17:25:04 +0000 |
| commit | 6ecec6096697729491ba141e7650ad69de5f034e (patch) | |
| tree | 74a3a028a59db0d94cc62d2df77edeb9539164eb /lisp/term.el | |
| parent | 55300e6cdc9b33b52cf17fe64a8ffbb6dce7ae8f (diff) | |
| download | emacs-6ecec6096697729491ba141e7650ad69de5f034e.tar.gz emacs-6ecec6096697729491ba141e7650ad69de5f034e.tar.bz2 emacs-6ecec6096697729491ba141e7650ad69de5f034e.zip | |
Define explicit-shell-file-name only in shell.el
For discussion, see the following thread:
https://lists.gnu.org/r/emacs-devel/2020-04/msg00880.html
* doc/emacs/cmdargs.texi (General Variables): Mention
shell-file-name in relation to SHELL.
* doc/emacs/misc.texi (Interactive Shell): Move index entry for
SHELL environment variable from here, where it is not mentioned...
(Single Shell): ...to here, where it is discussed along with
shell-file-name.
* lisp/dired.el (dired-insert-directory): Use shell-file-name
instead of explicit-shell-file-name when a shell is implicitly
requested.
* lisp/obsolete/terminal.el (explicit-shell-file-name):
* lisp/term.el (explicit-shell-file-name): Remove duplicate
defcustoms and load lisp/shell.el instead. (Bug#40679)
* lisp/shell.el (explicit-shell-file-name): Clarify docstring.
(shell): Simplify.
Diffstat (limited to 'lisp/term.el')
| -rw-r--r-- | lisp/term.el | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/lisp/term.el b/lisp/term.el index 148d7a7c286..34dc2870f21 100644 --- a/lisp/term.el +++ b/lisp/term.el @@ -299,17 +299,13 @@ ;; so it is important to increase it if there are protocol-relevant changes. (defconst term-protocol-version "0.96") -(eval-when-compile (require 'ange-ftp)) -(eval-when-compile (require 'cl-lib)) -(require 'ring) -(require 'ehelp) +(eval-when-compile + (require 'ange-ftp) + (require 'cl-lib)) (require 'comint) ; Password regexp. - -(declare-function ring-empty-p "ring" (ring)) -(declare-function ring-ref "ring" (ring index)) -(declare-function ring-insert-at-beginning "ring" (ring item)) -(declare-function ring-length "ring" (ring)) -(declare-function ring-insert "ring" (ring item)) +(require 'ehelp) +(require 'ring) +(require 'shell) (defgroup term nil "General command interpreter in a window." @@ -393,11 +389,6 @@ by moving term-home-marker. It is set to t if there is a (defvar-local term-line-mode-buffer-read-only nil "The `buffer-read-only' state to set in `term-line-mode'.") -(defcustom explicit-shell-file-name nil - "If non-nil, is file name to use for explicitly requested inferior shell." - :type '(choice (const nil) file) - :group 'term) - (defvar term-prompt-regexp "^" "Regexp to recognize prompts in the inferior process. Defaults to \"^\", the null string at BOL. |