[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/startup.el
From: |
Chong Yidong |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/startup.el |
Date: |
Sat, 29 Oct 2005 23:57:40 -0400 |
Index: emacs/lisp/startup.el
diff -c emacs/lisp/startup.el:1.382 emacs/lisp/startup.el:1.383
*** emacs/lisp/startup.el:1.382 Fri Oct 28 15:43:15 2005
--- emacs/lisp/startup.el Sun Oct 30 03:57:39 2005
***************
*** 850,863 ****
(when (eq user-init-file t)
;; If we did not find ~/.emacs, try
! ;; ~/.emacs.d/.emacs.
(let ((otherfile
(expand-file-name
! (file-name-nondirectory user-init-file-1)
(file-name-as-directory
! (expand-file-name
! ".emacs.d"
! (file-name-directory user-init-file-1))))))
(load otherfile t t)
;; If we did not find the user's init file,
--- 850,861 ----
(when (eq user-init-file t)
;; If we did not find ~/.emacs, try
! ;; ~/.emacs.d/init.el.
(let ((otherfile
(expand-file-name
! "init"
(file-name-as-directory
! (concat "~" init-file-user "/.emacs.d")))))
(load otherfile t t)
;; If we did not find the user's init file,