Mercurial > vim
changeset 31960:9460e6b656ca v9.0.1312
patch 9.0.1312: Cursor position wrong when splitting window in insert mode
Commit: https://github.com/vim/vim/commit/bc3dc298b37820a8212e7d839e882e07d6cc98c8
Author: Luuk van Baal <luukvbaal@gmail.com>
Date: Wed Feb 15 16:45:27 2023 +0000
patch 9.0.1312: Cursor position wrong when splitting window in insert mode
Problem: Cursor position wrong when splitting window in insert mode.
Solution: Pass the actual mode to win_fix_cursor(). (Luuk van Baal,
closes #11999,
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Wed, 15 Feb 2023 18:00:06 +0100 |
| parents | 2d1c9f3615db |
| children | 7d8431f21c98 |
| files | src/testdir/test_window_cmd.vim src/version.c src/window.c |
| diffstat | 3 files changed, 9 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/src/testdir/test_window_cmd.vim +++ b/src/testdir/test_window_cmd.vim @@ -1753,14 +1753,7 @@ func Test_splitkeep_options() " Scroll when cursor becomes invalid in insert mode. norm Lic - call assert_equal(curpos[0], getcurpos()[0], 'run ' .. run) - - " The line number might be one less because of round-off. - call assert_inrange(curpos[1] - 1, curpos[1], getcurpos()[1], 'run ' .. run) - - call assert_equal(curpos[2], getcurpos()[2], 'run ' .. run) - call assert_equal(curpos[3], getcurpos()[3], 'run ' .. run) - call assert_equal(curpos[4], getcurpos()[4], 'run ' .. run) + call assert_equal(curpos, getcurpos(), 'run ' .. run) " No scroll when topline not equal to 1 only | execute "norm gg5\<C-e>" | split | wincmd k
--- a/src/version.c +++ b/src/version.c @@ -696,6 +696,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1312, +/**/ 1311, /**/ 1310,
--- a/src/window.c +++ b/src/window.c @@ -5328,7 +5328,10 @@ win_enter_ext(win_T *wp, int flags) if (*p_spk == 'c') // assume cursor position needs updating changed_line_abv_curs(); else - win_fix_cursor(TRUE); + // Make sure the cursor position is valid, either by moving the cursor + // or by scrolling the text. + win_fix_cursor( + get_real_state() & (MODE_NORMAL|MODE_CMDLINE|MODE_TERMINAL)); // Now it is OK to parse messages again, which may be needed in // autocommands. @@ -6782,7 +6785,8 @@ win_fix_scroll(int resize) /* * Make sure the cursor position is valid for 'splitkeep'. * If it is not, put the cursor position in the jumplist and move it. - * If we are not in normal mode, scroll to make valid instead. + * If we are not in normal mode ("normal" is zero), make it valid by scrolling + * instead. */ static void win_fix_cursor(int normal)