diff options
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/shell.el | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f93539c416c..4a746ddce8a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2006-12-15 Richard Stallman <rms@gnu.org> + + * shell.el (shell): Doc fix. + 2006-12-15 Kevin Gallagher <Kevin.Gallagher@boeing.com> * emulation/edt.el (edt-xserver): 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'. |