summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2006-08-22 19:36:17 +0000
committerBram Moolenaar <Bram@vim.org>2006-08-22 19:36:17 +0000
commit621e2fdb5f96c2cd9b4672f68366130e88af75ca (patch)
tree24bae9ded7544ce657577de5fda65ee513a5ed51
parentd7fd0c4a372e6798ff02c73aefd55ec04643b429 (diff)
downloadvim-git-621e2fdb5f96c2cd9b4672f68366130e88af75ca.tar.gz
updated for version 7.0-065v7.0.065
-rw-r--r--src/gui_mac.c6
-rw-r--r--src/version.c2
2 files changed, 8 insertions, 0 deletions
diff --git a/src/gui_mac.c b/src/gui_mac.c
index e7e5437ca..87575f0f0 100644
--- a/src/gui_mac.c
+++ b/src/gui_mac.c
@@ -2480,6 +2480,12 @@ gui_mac_mouse_wheel(EventHandlerCallRef nextHandler, EventRef theEvent,
UInt32 mod;
SInt32 delta;
int_u vim_mod;
+ EventMouseWheelAxis axis;
+
+ if (noErr == GetEventParameter(theEvent, kEventParamMouseWheelAxis,
+ typeMouseWheelAxis, NULL, sizeof(axis), NULL, &axis)
+ && axis != kEventMouseWheelAxisY)
+ goto bail; /* Vim only does up-down scrolling */
if (noErr != GetEventParameter(theEvent, kEventParamMouseWheelDelta,
typeSInt32, NULL, sizeof(SInt32), NULL, &delta))
diff --git a/src/version.c b/src/version.c
index a708d3073..1f97a51a5 100644
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 65,
+/**/
64,
/**/
63,