Mercurial > emacs
changeset 104987:3727134fef6c
* term/x-win.el (x-initialize-window-system):
* term/w32-win.el (w32-initialize-window-system):
* term/ns-win.el (ns-initialize-window-system): Don't call
mouse-wheel-mode since it's enabled globally by default already.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Sat, 12 Sep 2009 19:04:24 +0000 |
| parents | 00c7c0e3f902 |
| children | 3edc5799260a |
| files | lisp/ChangeLog lisp/term/ns-win.el lisp/term/w32-win.el lisp/term/x-win.el |
| diffstat | 4 files changed, 5 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Sat Sep 12 19:03:49 2009 +0000 +++ b/lisp/ChangeLog Sat Sep 12 19:04:24 2009 +0000 @@ -1,5 +1,10 @@ 2009-09-12 Stefan Monnier <monnier@iro.umontreal.ca> + * term/x-win.el (x-initialize-window-system): + * term/w32-win.el (w32-initialize-window-system): + * term/ns-win.el (ns-initialize-window-system): Don't call + mouse-wheel-mode since it's enabled globally by default already. + * mwheel.el (mouse-wheel-mode): Make sure the new defvar doesn't actually define the variable, but only silences the byte-compiler. (mouse-wheel-change-button): Check whether mouse-wheel-mode is bound
--- a/lisp/term/ns-win.el Sat Sep 12 19:03:49 2009 +0000 +++ b/lisp/term/ns-win.el Sat Sep 12 19:04:24 2009 +0000 @@ -1253,7 +1253,6 @@ ;; FIXME: This will surely lead to "MODIFIED OUTSIDE CUSTOM" warnings. (menu-bar-mode (if (get-lisp-resource nil "Menus") 1 -1)) - (mouse-wheel-mode 1) (setq ns-initialized t))
--- a/lisp/term/w32-win.el Sat Sep 12 19:03:49 2009 +0000 +++ b/lisp/term/w32-win.el Sat Sep 12 19:04:24 2009 +0000 @@ -305,9 +305,6 @@ ;; that this is only annoying. (setq split-window-keep-point t) - ;; Turn on support for mouse wheels - (mouse-wheel-mode 1) - ;; W32 expects the menu bar cut and paste commands to use the clipboard. (menu-bar-enable-clipboard)
--- a/lisp/term/x-win.el Sat Sep 12 19:03:49 2009 +0000 +++ b/lisp/term/x-win.el Sat Sep 12 19:04:24 2009 +0000 @@ -1573,9 +1573,6 @@ ;; (if (featurep 'motif) ;; (global-set-key [f10] 'ignore)) - ;; Turn on support for mouse wheels. - (mouse-wheel-mode 1) - ;; Enable CLIPBOARD copy/paste through menu bar commands. (menu-bar-enable-clipboard)