From: Karl Heuer <kwzh@gnu.org>
Date: Thu, 16 Mar 1995 21:27:25 +0000 (+0000)
Subject: Use appropriate `fboundp' tests to decide what to load.
X-Git-Tag: emacs-19.34~4818
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7a701b9f830466649ec7c0f79a538a657c2da68a;p=emacs.git

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

diff --git a/lisp/loadup.el b/lisp/loadup.el
index 71d23f4a0a4..f8b33f1dfae 100644
--- 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")