# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1612988104 -3600
# Node ID 68f50677174151b700d936ac40b5f3f40d8b4711
# Parent  e2c0053823a56acda15f30edc0b81eb912ec5663
patch 8.2.2495: text jumps up and down when moving the cursor

Commit: https://github.com/vim/vim/commit/8f33ebfade10cd1b4296d8ec8dca815a09e8a405
Author: Bram Moolenaar <Bram@vim.org>
Date:   Wed Feb 10 21:10:12 2021 +0100

    patch 8.2.2495: text jumps up and down when moving the cursor

    Problem:    Text jumps up and down when moving the cursor in a small window
                with wrapping text and 'scrolloff' set.
    Solution:   Adjust the computation of w_skipcol. (partly by Ghjuvan Lacambre,
                closes #7813)

diff --git a/src/move.c b/src/move.c
--- a/src/move.c
+++ b/src/move.c
@@ -1125,10 +1125,10 @@ curs_columns(
 	    n = curwin->w_wrow + so;
 	else
 	    n = p_lines;
-	if ((colnr_T)n >= curwin->w_height + curwin->w_skipcol / width)
+	if ((colnr_T)n >= curwin->w_height + curwin->w_skipcol / width - so)
 	    extra += 2;
 
-	if (extra == 3 || p_lines < so * 2)
+	if (extra == 3 || p_lines <= so * 2)
 	{
 	    // not enough room for 'scrolloff', put cursor in the middle
 	    n = curwin->w_virtcol / width;
diff --git a/src/testdir/test_breakindent.vim b/src/testdir/test_breakindent.vim
--- a/src/testdir/test_breakindent.vim
+++ b/src/testdir/test_breakindent.vim
@@ -634,7 +634,7 @@ func Test_breakindent19_sbr_nextpage()
   call s:compare_lines(expect, lines)
   " Scroll down one screen line
   setl scrolloff=5
-  norm! 5gj
+  norm! 6gj
   redraw!
   let lines = s:screen_lines(1, 20)
   let expect = [
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2495,
+/**/
     2494,
 /**/
     2493,