summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>2005-10-28 16:17:01 +0000
committerRichard M. Stallman <rms@gnu.org>2005-10-28 16:17:01 +0000
commit165b0fa03d0f7652c247c671478070a5915881f2 (patch)
tree75044b690afd7b1c47288635040a7394c67f1a3d /lisp
parentce98f555a733c1b949369c0f98844178660a76c2 (diff)
downloademacs-165b0fa03d0f7652c247c671478070a5915881f2.tar.gz
("facemenu"): Load unconditionally.
("image", "international/fontset", "dnd", "mwheel", "tool-bar"): ("x-dnd"): Load, when appropriate.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/loadup.el17
1 files changed, 14 insertions, 3 deletions
diff --git a/lisp/loadup.el b/lisp/loadup.el
index 0d145486cdd..093f0ce4d13 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -133,9 +133,7 @@
(load "term/tty-colors")
(load "font-core")
-(if (fboundp 'frame-face-alist)
- (progn
- (load "facemenu")))
+(load "facemenu")
(if (fboundp 'track-mouse)
(progn
(load "mouse")
@@ -164,6 +162,18 @@
(load "vmsproc")))
(load "abbrev")
(load "buff-menu")
+
+(if (fboundp 'x-create-frame)
+ (progn
+ (load "image")
+ (load "international/fontset")
+ (load "dnd")
+ (load "mwheel")
+ (load "tool-bar")))
+(if (featurep 'x)
+ (load "x-dnd"))
+(message "%s" (garbage-collect))
+
(if (eq system-type 'vax-vms)
(progn
(load "vms-patch")))
@@ -195,6 +205,7 @@
(load "jka-cmpr-hook")
(load "ediff-hook")
(if (fboundp 'x-show-tip) (load "tooltip"))
+
(message "%s" (garbage-collect))
;If you want additional libraries to be preloaded and their