Mercurial > emacs
changeset 74446:cc077225d97f
(shell): Search the start file in ~/.emacs.d as `init_SHELLNAME.sh' instead.
| author | Juanma Barranquero <lekktu@gmail.com> |
|---|---|
| date | Tue, 05 Dec 2006 14:21:56 +0000 |
| parents | d26696d58462 |
| children | b57213679354 |
| files | lisp/shell.el |
| diffstat | 1 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/shell.el Tue Dec 05 14:20:57 2006 +0000 +++ b/lisp/shell.el Tue Dec 05 14:21:56 2006 +0000 @@ -521,9 +521,9 @@ 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 @@ (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))