From 40cf4b44ed6c7fae7d35b0652911cf7c97d9f2a2 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Tue, 26 Feb 2013 13:30:32 +0100 Subject: [PATCH] updated for version 7.3.833 Problem: In the terminal the scroll wheel always scrolls the active window. Solution: Scroll the window under the mouse pointer, like in the GUI. (Bradie Rao) --- src/edit.c | 7 +++---- src/normal.c | 7 +++---- src/version.c | 2 ++ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/edit.c b/src/edit.c index 3a0466595..74bbd9a10 100644 --- a/src/edit.c +++ b/src/edit.c @@ -9139,9 +9139,8 @@ ins_mousescroll(dir) tpos = curwin->w_cursor; -# if defined(FEAT_GUI) && defined(FEAT_WINDOWS) - /* Currently the mouse coordinates are only known in the GUI. */ - if (gui.in_use && mouse_row >= 0 && mouse_col >= 0) +# ifdef FEAT_WINDOWS + if (mouse_row >= 0 && mouse_col >= 0) { int row, col; @@ -9191,7 +9190,7 @@ ins_mousescroll(dir) # endif } -# if defined(FEAT_GUI) && defined(FEAT_WINDOWS) +# ifdef FEAT_WINDOWS curwin->w_redr_status = TRUE; curwin = old_curwin; diff --git a/src/normal.c b/src/normal.c index c79b67b1c..f9050db62 100644 --- a/src/normal.c +++ b/src/normal.c @@ -4649,11 +4649,10 @@ nv_screengo(oap, dir, dist) nv_mousescroll(cap) cmdarg_T *cap; { -# if defined(FEAT_GUI) && defined(FEAT_WINDOWS) +# ifdef FEAT_WINDOWS win_T *old_curwin = curwin; - /* Currently we only get the mouse coordinates in the GUI. */ - if (gui.in_use && mouse_row >= 0 && mouse_col >= 0) + if (mouse_row >= 0 && mouse_col >= 0) { int row, col; @@ -4698,7 +4697,7 @@ nv_mousescroll(cap) } # endif -# if defined(FEAT_GUI) && defined(FEAT_WINDOWS) +# ifdef FEAT_WINDOWS curwin->w_redr_status = TRUE; curwin = old_curwin; diff --git a/src/version.c b/src/version.c index 2625b89ae..3ab854834 100644 --- a/src/version.c +++ b/src/version.c @@ -728,6 +728,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 833, /**/ 832, /**/ -- 2.50.1