patch 9.1.1238: wrong cursor column with 'set splitkeep=screen'
Problem: With ':set splitkeep=screen', cursor did't restore column
correctly when splitting a window on a line longer than the
last line on the screen (after v9.1.0707)
Solution: Restore cursor column in `win_fix_scroll()` since it may be
changed in `getvcol()` after 396fd1ec2956 (phanium).
Example:
```
echo longlonglongling\nshort | vim - -u NONE --cmd 'set
splitkeep=screen' +'norm $' +new +q
```
fixes: #16968
closes: #16971
Signed-off-by: phanium <91544758+phanen@users.noreply.github.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
diff --git a/src/window.c b/src/window.c
index 4fb7054..21f81e5 100644
--- a/src/window.c
+++ b/src/window.c
@@ -7038,7 +7038,7 @@
{
int diff = (wp->w_winrow - wp->w_prev_winrow)
+ (wp->w_height - wp->w_prev_height);
- linenr_T lnum = wp->w_cursor.lnum;
+ pos_T cursor = wp->w_cursor;
wp->w_cursor.lnum = wp->w_botline - 1;
// Add difference in height and row to botline.
@@ -7052,7 +7052,8 @@
wp->w_fraction = FRACTION_MULT;
scroll_to_fraction(wp, wp->w_prev_height);
- wp->w_cursor.lnum = lnum;
+ wp->w_cursor = cursor;
+ wp->w_valid &= ~VALID_WCOL;
}
else if (wp == curwin)
wp->w_valid &= ~VALID_CROW;