summaryrefslogtreecommitdiff
path: root/lisp/loadup.el
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/loadup.el')
-rw-r--r--lisp/loadup.el17
1 files changed, 14 insertions, 3 deletions
diff --git a/lisp/loadup.el b/lisp/loadup.el
index 7c144bf8315..b6464372a41 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -60,15 +60,17 @@
(load "widget")
(load "custom")
(load "emacs-lisp/map-ynp")
-(load "env")
(load "cus-start")
(load "international/mule")
(load "international/mule-conf.el") ;Don't get confused if someone compiled this by mistake.
+(load "env")
(load "format")
(load "bindings")
(setq load-source-file-function 'load-with-code-conversion)
(load "files")
+(load "startup")
+
(load "cus-face")
(load "faces") ; after here, `defface' may be used.
@@ -131,6 +133,7 @@
(load "indent")
(load "window")
(load "frame")
+(load "termdev")
(load "term/tty-colors")
(load "font-core")
;; facemenu must be loaded before font-lock, because `facemenu-keymap'
@@ -153,7 +156,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")
@@ -179,7 +181,10 @@
(load "mwheel")
(load "tool-bar")))
(if (featurep 'x)
- (load "x-dnd"))
+ (progn
+ (load "x-dnd")
+ (load "term/x-win")))
+
(message "%s" (garbage-collect))
(if (eq system-type 'vax-vms)
@@ -187,6 +192,9 @@
(load "vms-patch")))
(if (eq system-type 'windows-nt)
(progn
+ (load "international/ccl")
+ (load "international/code-pages")
+ (load "term/w32-win")
(load "ls-lisp")
(load "disp-table") ; needed to setup ibm-pc char set, see internal.el
(load "dos-w32")
@@ -204,6 +212,9 @@
(if (eq system-type 'macos)
(progn
(load "ls-lisp")))
+(if (featurep 'mac-carbon)
+ (progn
+ (load "term/mac-win")))
(if (fboundp 'atan) ; preload some constants and
(progn ; floating pt. functions if we have float support.
(load "emacs-lisp/float-sup")))