# HG changeset patch # User Christian Brabandt # Date 1696867208 -7200 # Node ID 2232cbdb56e23828a85e04fe5d559993227bec11 # Parent ce6568aa4da298077dbad200ebc775dfc5d41e35 patch 9.0.2005: partially revert patch v9.0.1997 Commit: https://github.com/vim/vim/commit/b56cef0be08febc7e8edb8a87592f0a347c2793f Author: Christian Brabandt Date: Mon Oct 9 17:52:14 2023 +0200 patch 9.0.2005: partially revert patch v9.0.1997 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 diff --git a/src/move.c b/src/move.c --- 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 --- 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,