Use appropriate `fboundp' tests to decide what to load.

diff --git a/lisp/loadup.el b/lisp/loadup.el
index 71d23f4a0a4e4f0a3819a8ac5678bd6c8eee8b8c..f8b33f1dfae82f8811fecdc3128bb3ed4e1ab0a7 100644 (file)
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -53,14 +53,19 @@
 (load "indent")
 (garbage-collect)
 (load "window")
-(garbage-collect)
 (if (fboundp 'delete-frame)
     (progn
-      (load "frame")
-      (load "mouse")
+      (garbage-collect)
+      (load "frame")))
+(if (fboundp 'frame-face-alist)
+    (progn
       (garbage-collect)
       (load "faces")
-      (load "facemenu")
+      (load "facemenu")))
+(if (fboundp 'track-mouse)
+    (progn
+      (garbage-collect)
+      (load "mouse")
       (garbage-collect)
       (load "menu-bar")
       (load "scroll-bar")