[Emacs-diffs] Changes to emacs/lisp/cmuscheme.el,v

[Juanma Barranquero]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Juanma Barranquero <lektu>      06/12/05 14:20:57

Index: cmuscheme.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/cmuscheme.el,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- cmuscheme.el        5 Dec 2006 05:53:11 -0000       1.43
+++ cmuscheme.el        5 Dec 2006 14:20:57 -0000       1.44
@@ -244,7 +244,8 @@
 If there is a process already running in `*scheme*', switch to that buffer.
 With argument, allows you to edit the command line (default is value
 of `scheme-program-name').
-If a file `~/.emacs_SCHEMENAME' exists, it is given as initial input.
+If the file `~/.emacs_SCHEMENAME' or `~/.emacs.d/init_SCHEMENAME.scm' exists,
+it is given as initial input.
 Note that this may lose due to a timing error if the Scheme processor
 discards input when it starts up.
 Runs the hook `inferior-scheme-mode-hook' \(after the `comint-mode-hook'
@@ -268,12 +269,12 @@
   "Return the name of the start file corresponding to PROG.
 Search in the directories \"~\" and \"~/.emacs.d\", in this
 order.  Return nil if no start file found."
-  (let* ((name (concat ".emacs_" (file-name-nondirectory prog)))
-         (start-file (concat "~/" name)))
+  (let ((progname (file-name-nondirectory prog))
+       (start-file (concat "~/.emacs_" progname))
+       (alt-start-file (concat "~/.emacs.d/init_" progname ".scm")))
     (if (file-exists-p start-file)
         start-file
-      (let ((start-file (concat "~/.emacs.d/" name)))
-        (and (file-exists-p start-file) start-file)))))
+      (and (file-exists-p alt-start-file) alt-start-file))))
 
 (defun scheme-send-region (start end)
   "Send the current region to the inferior Scheme process."