From: Richard M. Stallman <rms@gnu.org>
Date: Sat, 26 Oct 2002 22:42:12 +0000 (+0000)
Subject: (shell): Look for .emacs_SHELL under ~/.emacs.d after looking in ~.
X-Git-Tag: ttn-vms-21-2-B4~12711
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4df542027f158d815f40353767d476f4d86b976c;p=emacs.git

(shell): Look for .emacs_SHELL under ~/.emacs.d after looking in ~.
---

diff --git a/lisp/shell.el b/lisp/shell.el
index 94df8733265..0eaea9af27f 100644
--- a/lisp/shell.el
+++ b/lisp/shell.el
@@ -506,6 +506,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)))
       (apply 'make-comint-in-buffer "shell" buffer prog
 	     (if (file-exists-p startfile) startfile)
 	     (if (and xargs-name (boundp xargs-name))