aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/startup.el7
1 files changed, 5 insertions, 2 deletions
diff --git a/lisp/startup.el b/lisp/startup.el
index c4a11809a73..8405cb2332f 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -141,8 +141,6 @@ directory name of the directory where the `.emacs' file was looked for.")
141 (setq default-directory (abbreviate-file-name default-directory)) 141 (setq default-directory (abbreviate-file-name default-directory))
142 (unwind-protect 142 (unwind-protect
143 (command-line) 143 (command-line)
144 ;; Run the site-start library if it exists.
145 (load "site-start" t t)
146 (run-hooks 'emacs-startup-hook) 144 (run-hooks 'emacs-startup-hook)
147 (and term-setup-hook 145 (and term-setup-hook
148 (run-hooks 'term-setup-hook)) 146 (run-hooks 'term-setup-hook))
@@ -213,6 +211,11 @@ directory name of the directory where the `.emacs' file was looked for.")
213 211
214 (run-hooks 'before-init-hook) 212 (run-hooks 'before-init-hook)
215 213
214 ;; Run the site-start library if it exists. The point of this file is
215 ;; that it is run before .emacs. There is no point in doing this after
216 ;; .emacs; that is useless.
217 (load "site-start" t t)
218
216 ;; Load that user's init file, or the default one, or none. 219 ;; Load that user's init file, or the default one, or none.
217 (let ((debug-on-error init-file-debug) 220 (let ((debug-on-error init-file-debug)
218 ;; This function actually reads the init files. 221 ;; This function actually reads the init files.