[Emacs-diffs] emacs/lisp ChangeLog mwheel.el

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      09/08/16 05:49:29

Modified files:
        lisp           : ChangeLog mwheel.el 

Log message:
        * mwheel.el (mouse-wheel-down-event, mouse-wheel-up-event): Don't
        initialize based on window-system (Bug#4124).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.15942&r2=1.15943
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/mwheel.el?cvsroot=emacs&r1=1.52&r2=1.53

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15942
retrieving revision 1.15943
diff -u -b -r1.15942 -r1.15943
--- ChangeLog   16 Aug 2009 05:25:21 -0000      1.15942
+++ ChangeLog   16 Aug 2009 05:49:26 -0000      1.15943
@@ -1,5 +1,8 @@
 2009-08-16  Chong Yidong  <address@hidden>
 
+       * mwheel.el (mouse-wheel-down-event, mouse-wheel-up-event): Don't
+       initialize based on window-system (Bug#4124).
+
        * facemenu.el (facemenu-read-color): Use a completion function
        that accepts any defined color, such as RGB triplets (Bug#3677).
 

Index: mwheel.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/mwheel.el,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -b -r1.52 -r1.53
--- mwheel.el   5 Jan 2009 03:19:36 -0000       1.52
+++ mwheel.el   16 Aug 2009 05:49:29 -0000      1.53
@@ -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