summaryrefslogtreecommitdiff
path: root/lisp/loadup.el
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/loadup.el')
-rw-r--r--lisp/loadup.el5
1 files changed, 4 insertions, 1 deletions
diff --git a/lisp/loadup.el b/lisp/loadup.el
index 8fd2eb90736..da7613bee25 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -180,7 +180,6 @@
(load "image")
(load "international/fontset")
(load "dnd")
- (load "mwheel")
(load "tool-bar")))
(if (featurep 'x)
(progn
@@ -213,6 +212,10 @@
(progn
(load "emacs-lisp/easymenu") ;; for platform-related menu adjustments
(load "term/ns-win")))
+(if (fboundp 'x-create-frame)
+ ;; Do it after loading term/foo-win.el since the value of the
+ ;; mouse-wheel-*-event vars depends on those files being loaded or not.
+ (load "mwheel"))
(if (fboundp 'atan) ; preload some constants and
(progn ; floating pt. functions if we have float support.
(load "emacs-lisp/float-sup")))