diff options
author | Karl Heuer <kwzh@gnu.org> | 1995-03-23 21:44:59 +0000 |
---|---|---|
committer | Karl Heuer <kwzh@gnu.org> | 1995-03-23 21:44:59 +0000 |
commit | 6ddee7fbbf56bc53737d67a867950b7bc80e51ce (patch) | |
tree | 0025a48d6d3255b0e97fc457cc2ef5b58c5dbd4c /lisp/loadup.el | |
parent | 341d5bfba3f2cda9e595804b0c9a9281ffe5fa3a (diff) | |
download | emacs-6ddee7fbbf56bc53737d67a867950b7bc80e51ce.tar.gz |
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.
Diffstat (limited to 'lisp/loadup.el')
-rw-r--r-- | lisp/loadup.el | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/lisp/loadup.el b/lisp/loadup.el index 95b60c07b25..a4f74d982ef 100644 --- 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. |