mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-04 11:40:22 +00:00
Code Issues Releases Activity

(command-line): Load custom-file if not done yet.

Browse Source
This commit is contained in:
Stefan Monnier 2002-08-14 21:46:21 +00:00
parent 2ca20b4149
commit 694210c486
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lisp/startup.el
View File

@ -932,6 +932,12 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'."
(sit-for 1))
(setq user-init-file source))))
(when (and (stringp custom-file)
(not (assoc custom-file load-history)))
;; If the .emacs file has set `custom-file' but hasn't
;; loaded the file yet, let's load it.
(load custom-file t t))
(or inhibit-default-init
(let ((inhibit-startup-message nil))
;; Users are supposed to be told their rights.
@ -1018,8 +1024,7 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'."
;; If *scratch* exists and init file didn't change its mode, initialize it.
(if (get-buffer "*scratch*")
(save-excursion
(set-buffer "*scratch*")
(with-current-buffer "*scratch*"
(if (eq major-mode 'fundamental-mode)
(funcall initial-major-mode))))