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)

diff --git a/src/edit.c b/src/edit.c
index 3a0466595a9f520c08a3dd3f468ee20dbd679727..74bbd9a109bebae4012d31e8e70e40e4e959596d 100644 (file)
--- 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 c79b67b1c1ecc370c5e2b105256b64926103c350..f9050db6250dd2260a0dfb39d378fdecedb1e2b7 100644 (file)
--- 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 2625b89aef5a50ef217a6b87c7cf38ac8254ef5a..3ab85483431f7a83335073f16d690deb7749c256 100644 (file)
--- 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,
 /**/