Mercurial > emacs
diff lisp/cmuscheme.el @ 90729:6588c6259dfb
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 545-562)
- Update from CVS
- Update from erc--emacs--22
- Merge from gnus--rel--5.10
- erc-iswitchb: Temporarily enable iswitchb mode
* gnus--rel--5.10 (patch 172-176)
- Merge from emacs--devo--0
- Update from CVS
- Update from CVS: lisp/legacy-gnus-agent.el: Add Copyright notice.
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-156
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Sat, 16 Dec 2006 01:29:26 +0000 |
| parents | f1d13e615070 3fccc1870d62 |
| children | 95d0cdf160ea |
line wrap: on
line diff
--- a/lisp/cmuscheme.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/cmuscheme.el Sat Dec 16 01:29:26 2006 +0000 @@ -269,9 +269,9 @@ "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 ((progname (file-name-nondirectory prog)) - (start-file (concat "~/.emacs_" progname)) - (alt-start-file (concat "~/.emacs.d/init_" progname ".scm"))) + (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 (and (file-exists-p alt-start-file) alt-start-file))))