diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2009-09-12 04:38:03 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2009-09-12 04:38:03 +0000 |
| commit | ab5c0fcd35dcdf465a597ed83e5783bbbf70eff1 (patch) | |
| tree | 024ebc25fb37774578221b859798c7ab61a58beb /lisp/loadup.el | |
| parent | 45448e641a75f56a010396d664491dafe5c6d85a (diff) | |
| download | emacs-ab5c0fcd35dcdf465a597ed83e5783bbbf70eff1.tar.gz | |
* mwheel.el (mwheel-installed-bindings): New var.
(mouse-wheel-mode): Use it, so as to make sure we really remove all
the bindings we set last time. Use custom-initialize-delay.
* loadup.el: Load mwheel after term/*-win.el.
* startup.el (command-line): Don't reevaluate mouse-wheel-down-event
and mouse-wheel-up-event now that their first evaluation is done
sufficiently late to be correct.
Diffstat (limited to 'lisp/loadup.el')
| -rw-r--r-- | lisp/loadup.el | 5 |
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"))) |