summaryrefslogtreecommitdiff
path: root/lisp/loadup.el
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/loadup.el')
-rw-r--r--lisp/loadup.el12
1 files changed, 11 insertions, 1 deletions
diff --git a/lisp/loadup.el b/lisp/loadup.el
index bd90fb7c53a..82f6b1d6641 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -67,6 +67,8 @@
(setq load-source-file-function 'load-with-code-conversion)
(load "files")
+(load "startup")
+
(load "cus-face")
(load "faces") ; after here, `defface' may be used.
@@ -146,7 +148,6 @@
(message "%s" (garbage-collect))
(load "menu-bar")
(load "paths.el") ;Don't get confused if someone compiled paths by mistake.
-(load "startup")
(load "emacs-lisp/lisp")
(load "textmodes/page")
(load "register")
@@ -189,6 +190,15 @@
(load "emacs-lisp/float-sup")))
(message "%s" (garbage-collect))
+;; Load auxiliary settings for X displays if we support them.
+(when (fboundp 'x-create-frame)
+ (load "mouse")
+ (load "international/fontset")
+ (load "x-dnd")
+ (load "term/x-win"))
+
+(message "%s" (garbage-collect))
+
(load "vc-hooks")
(load "ediff-hook")
(message "%s" (garbage-collect))