Don't load mouse and face files in system-specific

branches; an earlier test has already loaded them based on a
symbol equivalent to HAVE_MOUSE or HAVE_FACES.

diff --git a/lisp/loadup.el b/lisp/loadup.el
index 95b60c07b25d8585dfd26ded4af92163f4f5fbcb..a4f74d982ef658e11f54ce87b3c6209bc5208ee2 100644 (file)
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -114,11 +114,7 @@
       (load "ls-lisp")
       (garbage-collect)
       (load "winnt")
-      (garbage-collect)
-      (if (not (featurep 'mouse))
-         (progn
-           (load "mouse")
-           (garbage-collect)))))
+      (garbage-collect)))
 (if (eq system-type 'ms-dos)
     (progn
       (load "ls-lisp")
@@ -126,13 +122,7 @@
       (load "dos-fns")
       (garbage-collect)
       (load "disp-table") ; needed to setup ibm-pc char set, see internal.el
-      (garbage-collect)
-      (if (not (fboundp 'delete-frame))
-         (progn
-           (load "mouse")
-           (garbage-collect)
-           (load "faces")
-           (garbage-collect)))))
+      (garbage-collect)))
 (if (fboundp 'atan)    ; preload some constants and 
     (progn             ; floating pt. functions if 
       (garbage-collect)        ; we have float support.