From: Richard M. Stallman <rms@gnu.org>
Date: Fri, 28 Oct 2005 16:17:01 +0000 (+0000)
Subject: ("facemenu"): Load unconditionally.
X-Git-Tag: emacs-pretest-22.0.90~6248
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=165b0fa03d0f7652c247c671478070a5915881f2;p=emacs.git

("facemenu"): Load unconditionally.
("image", "international/fontset", "dnd", "mwheel", "tool-bar"):
("x-dnd"): Load, when appropriate.
---

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