From: Juanma Barranquero <lekktu@gmail.com>
Date: Tue, 5 Dec 2006 14:21:56 +0000 (+0000)
Subject: (shell): Search the start file in ~/.emacs.d as `init_SHELLNAME.sh' instead.
X-Git-Tag: emacs-pretest-22.0.92~277
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ec1d7c6e3ea1e110f19b5d6731354418fffde0aa;p=emacs.git

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

diff --git a/lisp/shell.el b/lisp/shell.el
index a778584895a..2b1b6a907e4 100644
--- a/lisp/shell.el
+++ b/lisp/shell.el
@@ -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))