Commit c3ab3701 authored by Chong Yidong's avatar Chong Yidong
Browse files

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

	~/.emacs.d/.emacs.
parent 27a19a63
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.
......
......@@ -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,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment