mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-23 10:34:07 +00:00
Code Issues Releases Activity

(shell): Search the start file in ~/.emacs.d as `init_SHELLNAME.sh' instead.

Browse Source
This commit is contained in:
Juanma Barranquero 2006-12-05 14:21:56 +00:00
parent 003585953e
commit ec1d7c6e3e
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lisp/shell.el
View File

@ -521,9 +521,9 @@ 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 else from SHELL if there is no ESHELL.
If a file `~/.emacs_SHELLNAME' exists, 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.)
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).
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'.
@ -556,8 +556,8 @@ Otherwise, one argument `-i' is passed to the shell.
(name (file-name-nondirectory prog))
(startfile (concat "~/.emacs_" name))
(xargs-name (intern-soft (concat "explicit-" name "-args"))))
(if (not (file-exists-p startfile))
(setq startfile (concat "~/.emacs.d/.emacs_" name)))
(unless (file-exists-p startfile)
(setq startfile (concat "~/.emacs.d/init_" name ".sh")))
(apply 'make-comint-in-buffer "shell" buffer prog
(if (file-exists-p startfile) startfile)
(if (and xargs-name (boundp xargs-name))