mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-05 07:01:11 -08:00
Code Issues Projects Releases Wiki Activity

* startup.el (command-line): Use ~/.emacs.d/init.el instead of

Browse source 
~/.emacs.d/.emacs.
This commit is contained in:
Chong Yidong 2005-10-30 03:57:39 +00:00
parent 27a19a6347
commit c3ab3701f0
2 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
2005-10-29 Chong Yidong <cyd@stupidchicken.com>
* startup.el (command-line): Use ~/.emacs.d/init.el instead of
~/.emacs.d/.emacs.
2005-10-29 Richard M. Stallman <rms@gnu.org>
* replace.el (occur-mode-mouse-goto): Always go to other window.

8
lisp/startup.el
View file

@ -850,14 +850,12 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'."
(when (eq user-init-file t)
;; If we did not find ~/.emacs, try
;; ~/.emacs.d/.emacs.
;; ~/.emacs.d/init.el.
(let ((otherfile
(expand-file-name
(file-name-nondirectory user-init-file-1)
"init"
(file-name-as-directory
(expand-file-name
".emacs.d"
(file-name-directory user-init-file-1))))))
(concat "~" init-file-user "/.emacs.d")))))
(load otherfile t t)
;; If we did not find the user's init file,