summaryrefslogtreecommitdiff
path: root/lisp/shell.el
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>2006-12-15 21:17:01 +0000
committerRichard M. Stallman <rms@gnu.org>2006-12-15 21:17:01 +0000
commit71af6fc4675b3312c998a66efc0db8f503d965d0 (patch)
tree0e874048b7c38a713a6c7767f102151598d7d2f6 /lisp/shell.el
parentf038449950d1fdf0a93f033b53f73ef24a2f617b (diff)
downloademacs-71af6fc4675b3312c998a66efc0db8f503d965d0.tar.gz
(shell): Doc fix.
Diffstat (limited to 'lisp/shell.el')
-rw-r--r--lisp/shell.el5
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/shell.el b/lisp/shell.el
index 2b1b6a907e4..a257bafcd4f 100644
--- a/lisp/shell.el
+++ b/lisp/shell.el
@@ -520,10 +520,11 @@ 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.
If a file `~/.emacs_SHELLNAME' exists, or `~/.emacs.d/init_SHELLNAME.sh',
-it is given as initial input (Note that this may lose due to a timing
-error if the shell discards input when it starts up).
+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).
The buffer is put in Shell mode, giving commands for sending input
and controlling the subjobs of the shell. See `shell-mode'.
See also the variable `shell-prompt-pattern'.