summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Brabandt <cb@256bit.org>2023-10-09 17:52:14 +0200
committerChristian Brabandt <cb@256bit.org>2023-10-09 17:55:02 +0200
commitb56cef0be08febc7e8edb8a87592f0a347c2793f (patch)
tree2dcde75816cc7f7f0ba88e0ec1dd3f9d34c58267
parentd4afbdd0715c722cfc73d3a8ab9e578667615faa (diff)
patch 9.0.2005: partially revert patch v9.0.1997v9.0.2005
Problem: partially revert patch v9.0.1997 Solution: add a comment, to make clear it's not used related: #13288 Signed-off-by: Christian Brabandt <cb@256bit.org>
-rw-r--r--src/move.c10
-rw-r--r--src/version.c2
2 files changed, 12 insertions, 0 deletions
diff --git a/src/move.c b/src/move.c
index a0d3a6014a..42878e4ad9 100644
--- a/src/move.c
+++ b/src/move.c
@@ -1753,7 +1753,12 @@ scrolldown(
++row;
}
if (col > width2 && width2 > 0)
+ {
row += col / width2;
+ // even so col is not used anymore,
+ // make sure it is correct, just in case
+ col = col % width2;
+ }
if (row >= curwin->w_height)
{
curwin->w_curswant = curwin->w_virtcol
@@ -1986,7 +1991,12 @@ adjust_skipcol(void)
++row;
}
if (col > width2)
+ {
row += col / width2;
+ // col may no longer be used, but make
+ // sure it is correct anyhow, just in case
+ col = col % width2;
+ }
if (row >= curwin->w_height)
{
if (curwin->w_skipcol == 0)
diff --git a/src/version.c b/src/version.c
index 6602a489e1..e862e33324 100644
--- a/src/version.c
+++ b/src/version.c
@@ -705,6 +705,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2005,
+/**/
2004,
/**/
2003,