mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-29 06:28:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.0.0901: setting w_leftcol and handling side effects is confusing

Browse Source 
Problem:    Setting w_leftcol and handling side effects is confusing.
Solution:   Use a function to set w_leftcol() and handle side effects.

0c34d56264

Co-authored-by: Bram Moolenaar <Bram@vim.org>
This commit is contained in:
Luuk van Baal
2023-04-27 19:08:20 +02:00
parent 3621604029
commit 26a9f0e94e
3 changed files with 23 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/nvim/normal.c
View File

@@ -2158,9 +2158,8 @@ void check_scrollbind(linenr_T topline_diff, long leftcol_diff)
}
// do the horizontal scroll
if (want_hor && curwin->w_leftcol != tgt_leftcol) {
curwin->w_leftcol = tgt_leftcol;
leftcol_changed();
if (want_hor) {
(void)set_leftcol(tgt_leftcol);
}
}
@@ -2643,7 +2642,7 @@ void scroll_redraw(int up, long count)
scrollup(count, true) :
scrolldown(count, true);
if (get_scrolloff_value(curwin)) {
if (get_scrolloff_value(curwin) > 0) {
// Adjust the cursor position for 'scrolloff'. Mark w_topline as
// valid, otherwise the screen jumps back at the end of the file.
cursor_correct();
@@ -2894,27 +2893,21 @@ static void nv_zet(cmdarg_T *cap)
case 'h':
case K_LEFT:
if (!curwin->w_p_wrap) {
if ((colnr_T)cap->count1 > curwin->w_leftcol) {
curwin->w_leftcol = 0;
} else {
curwin->w_leftcol -= (colnr_T)cap->count1;
}
leftcol_changed();
(void)set_leftcol((colnr_T)cap->count1 > curwin->w_leftcol
? 0 : curwin->w_leftcol - (colnr_T)cap->count1);
}
break;
// "zL" - scroll screen left half-page
// "zL" - scroll window left half-page
case 'L':
cap->count1 *= curwin->w_width_inner / 2;
FALLTHROUGH;
// "zl" - scroll screen to the left
// "zl" - scroll window to the left if not wrapping
case 'l':
case K_RIGHT:
if (!curwin->w_p_wrap) {
// scroll the window left
curwin->w_leftcol += (colnr_T)cap->count1;
leftcol_changed();
(void)set_leftcol(curwin->w_leftcol + (colnr_T)cap->count1);
}
break;