summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>2006-12-15 21:21:43 +0000
committerRichard M. Stallman <rms@gnu.org>2006-12-15 21:21:43 +0000
commitc86d56a52995ed9b656b079a7f9aef269792ffe1 (patch)
tree1845bc66d65c9abd78f10bb8c46a148fa3bc1f8a
parenta0eddf5e489400bd8e058f55f1cd86aef789f69c (diff)
downloademacs-c86d56a52995ed9b656b079a7f9aef269792ffe1.tar.gz
(shell): Doc fix.
-rw-r--r--lisp/shell.el3
1 files changed, 1 insertions, 2 deletions
diff --git a/lisp/shell.el b/lisp/shell.el
index a257bafcd4f..27220b54ab0 100644
--- a/lisp/shell.el
+++ b/lisp/shell.el
@@ -520,8 +520,7 @@ If BUFFER exists but shell process is not running, make new shell.
If BUFFER exists and shell process is running, just switch to BUFFER.
Program used comes from variable `explicit-shell-file-name',
or (if that is nil) from the ESHELL environment variable,
- or (if that is nil) from `shell-file-name'
- or else from SHELL if there is no ESHELL.
+ or (if that is nil) from `shell-file-name'.
If a file `~/.emacs_SHELLNAME' exists, or `~/.emacs.d/init_SHELLNAME.sh',
it is given as initial input (but this may be lost, due to a timing
error, if the shell discards input when it starts up).