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

vim-patch:9.0.1312: Cursor position wrong when splitting window in insert mode

Browse Source 
Problem:    Cursor position wrong when splitting window in insert mode.
Solution:   Pass the actual mode to win_fix_cursor(). (Luuk van Baal,
            closes vim/vim#11999,

bc3dc298b3

Co-authored-by: Luuk van Baal <luukvbaal@gmail.com>
This commit is contained in:
zeertzjq
2023-02-16 07:41:39 +08:00
parent a2dd7fa97b
commit 0bb3a373d3
2 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/nvim/testdir/test_window_cmd.vim
View File

@@ -1653,14 +1653,7 @@ func Test_splitkeep_options()
" Scroll when cursor becomes invalid in insert mode. " Scroll when cursor becomes invalid in insert mode.
norm Lic norm Lic
call assert_equal(curpos[0], getcurpos()[0], 'run ' .. run) call assert_equal(curpos, getcurpos(), '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)
" No scroll when topline not equal to 1 " No scroll when topline not equal to 1
only | execute "norm gg5\<C-e>" | split | wincmd k only | execute "norm gg5\<C-e>" | split | wincmd k

7
src/nvim/window.c
View File

@@ -4835,7 +4835,9 @@ static void win_enter_ext(win_T *const wp, const int flags)
if (*p_spk == 'c') { if (*p_spk == 'c') {
changed_line_abv_curs(); // assume cursor position needs updating changed_line_abv_curs(); // assume cursor position needs updating
} else { } 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));
} }
fix_current_dir(); fix_current_dir();
@@ -6407,7 +6409,8 @@ void win_fix_scroll(int resize)
/// Make sure the cursor position is valid for 'splitkeep'. /// Make sure the cursor position is valid for 'splitkeep'.
/// If it is not, put the cursor position in the jumplist and move it. /// 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) static void win_fix_cursor(int normal)
{ {
win_T *wp = curwin; win_T *wp = curwin;