diff options
| author | Karl Heuer | 1995-03-23 21:44:59 +0000 |
|---|---|---|
| committer | Karl Heuer | 1995-03-23 21:44:59 +0000 |
| commit | fa7a4531e740348160ba41cc8655ae40fad206d9 (patch) | |
| tree | 7060b9b06bc211398d3c314af4f7f1bc1d79e615 | |
| parent | ce339dfb6d4ca276b5953392e168c5bc7bee1090 (diff) | |
| download | emacs-fa7a4531e740348160ba41cc8655ae40fad206d9.tar.gz emacs-fa7a4531e740348160ba41cc8655ae40fad206d9.zip | |
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.
| -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 @@ | |||
| 114 | (load "ls-lisp") | 114 | (load "ls-lisp") |
| 115 | (garbage-collect) | 115 | (garbage-collect) |
| 116 | (load "winnt") | 116 | (load "winnt") |
| 117 | (garbage-collect) | 117 | (garbage-collect))) |
| 118 | (if (not (featurep 'mouse)) | ||
| 119 | (progn | ||
| 120 | (load "mouse") | ||
| 121 | (garbage-collect))))) | ||
| 122 | (if (eq system-type 'ms-dos) | 118 | (if (eq system-type 'ms-dos) |
| 123 | (progn | 119 | (progn |
| 124 | (load "ls-lisp") | 120 | (load "ls-lisp") |
| @@ -126,13 +122,7 @@ | |||
| 126 | (load "dos-fns") | 122 | (load "dos-fns") |
| 127 | (garbage-collect) | 123 | (garbage-collect) |
| 128 | (load "disp-table") ; needed to setup ibm-pc char set, see internal.el | 124 | (load "disp-table") ; needed to setup ibm-pc char set, see internal.el |
| 129 | (garbage-collect) | 125 | (garbage-collect))) |
| 130 | (if (not (fboundp 'delete-frame)) | ||
| 131 | (progn | ||
| 132 | (load "mouse") | ||
| 133 | (garbage-collect) | ||
| 134 | (load "faces") | ||
| 135 | (garbage-collect))))) | ||
| 136 | (if (fboundp 'atan) ; preload some constants and | 126 | (if (fboundp 'atan) ; preload some constants and |
| 137 | (progn ; floating pt. functions if | 127 | (progn ; floating pt. functions if |
| 138 | (garbage-collect) ; we have float support. | 128 | (garbage-collect) ; we have float support. |