diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2009-08-16 05:49:26 +0000 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2009-08-16 05:49:26 +0000 |
| commit | 19261da4e2cdfbe382c931c97c8745727ab8ab4d (patch) | |
| tree | a5b04a0ecc28dd08991b2b9bb9f69ea39797e1f6 /lisp/mwheel.el | |
| parent | daad00fc06cc055034094e8a1941c6d22967e6bd (diff) | |
| download | emacs-19261da4e2cdfbe382c931c97c8745727ab8ab4d.tar.gz | |
* mwheel.el (mouse-wheel-down-event, mouse-wheel-up-event): Don't
initialize based on window-system (Bug#4124).
Diffstat (limited to 'lisp/mwheel.el')
| -rw-r--r-- | lisp/mwheel.el | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/lisp/mwheel.el b/lisp/mwheel.el index 6444ba401d6..37980279a28 100644 --- a/lisp/mwheel.el +++ b/lisp/mwheel.el @@ -57,11 +57,9 @@ 'mouse-wheel-down-event "22.1") (defcustom mouse-wheel-down-event - ;; In the latest versions of XEmacs, we could just use mouse-%s as well. - (if (memq window-system '(w32 ns)) + (if (or (featurep 'w32-win) (featurep 'ns-win)) 'wheel-up - (intern (format (if (featurep 'xemacs) "button%s" "mouse-%s") - mouse-wheel-down-button))) + (intern (format "mouse-%s" mouse-wheel-down-button))) "Event used for scrolling down." :group 'mouse :type 'symbol @@ -72,11 +70,9 @@ 'mouse-wheel-up-event "22.1") (defcustom mouse-wheel-up-event - ;; In the latest versions of XEmacs, we could just use mouse-%s as well. - (if (memq window-system '(w32 ns)) + (if (or (featurep 'w32-win) (featurep 'ns-win)) 'wheel-down - (intern (format (if (featurep 'xemacs) "button%s" "mouse-%s") - mouse-wheel-up-button))) + (intern (format "mouse-%s" mouse-wheel-up-button))) "Event used for scrolling up." :group 'mouse :type 'symbol @@ -87,9 +83,7 @@ 'mouse-wheel-click-event "22.1") (defcustom mouse-wheel-click-event - ;; In the latest versions of XEmacs, we could just use mouse-%s as well. - (intern (format (if (featurep 'xemacs) "button%s" "mouse-%s") - mouse-wheel-click-button)) + (intern (format "mouse-%s" mouse-wheel-click-button)) "Event that should be temporarily inhibited after mouse scrolling. The mouse wheel is typically on the mouse-2 button, so it may easily happen that text is accidentally yanked into the buffer when |