mirror of
https://github.com/neovim/neovim
synced 2025-07-16 09:11:51 +00:00
vim-patch:9.1.1048: crash after scrolling and pasting in silent Ex mode (#32168)
Problem: Crash after scrolling and pasting in silent Ex mode. (fizz-is-on-the-way) Solution: Don't move cursor to line 0 when scrolling. (zeertzjq) closes: vim/vim#16506df098fedbc
(cherry picked from commita9c12d4c29
)
This commit is contained in:
committed by
github-actions[bot]
parent
3a50639331
commit
938a600847
@ -2523,7 +2523,10 @@ int pagescroll(Direction dir, int count, bool half)
|
|||||||
if (!nochange) {
|
if (!nochange) {
|
||||||
// Place cursor at top or bottom of window.
|
// Place cursor at top or bottom of window.
|
||||||
validate_botline(curwin);
|
validate_botline(curwin);
|
||||||
curwin->w_cursor.lnum = (dir == FORWARD ? curwin->w_topline : curwin->w_botline - 1);
|
linenr_T lnum = (dir == FORWARD ? curwin->w_topline : curwin->w_botline - 1);
|
||||||
|
// In silent Ex mode the value of w_botline - 1 may be 0,
|
||||||
|
// but cursor lnum needs to be at least 1.
|
||||||
|
curwin->w_cursor.lnum = MAX(lnum, 1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1338,11 +1338,27 @@ func Test_scroll_in_ex_mode()
|
|||||||
call writefile(['done'], 'Xdone')
|
call writefile(['done'], 'Xdone')
|
||||||
qa!
|
qa!
|
||||||
END
|
END
|
||||||
call writefile(lines, 'Xscript')
|
call writefile(lines, 'Xscript', 'D')
|
||||||
call assert_equal(1, RunVim([], [], '--clean -X -Z -e -s -S Xscript'))
|
call assert_equal(1, RunVim([], [], '--clean -X -Z -e -s -S Xscript'))
|
||||||
call assert_equal(['done'], readfile('Xdone'))
|
call assert_equal(['done'], readfile('Xdone'))
|
||||||
|
|
||||||
call delete('Xscript')
|
call delete('Xdone')
|
||||||
|
endfunc
|
||||||
|
|
||||||
|
func Test_scroll_and_paste_in_ex_mode()
|
||||||
|
throw 'Skipped: does not work when Nvim is run from :!'
|
||||||
|
" This used to crash because of moving cursor to line 0.
|
||||||
|
let lines =<< trim END
|
||||||
|
v/foo/vi|YY9PYQ
|
||||||
|
v/bar/vi|YY9PYQ
|
||||||
|
v/bar/exe line('.') == 1 ? "vi|Y\<C-B>9PYQ" : "vi|YQ"
|
||||||
|
call writefile(['done'], 'Xdone')
|
||||||
|
qa!
|
||||||
|
END
|
||||||
|
call writefile(lines, 'Xscript', 'D')
|
||||||
|
call assert_equal(1, RunVim([], [], '-u NONE -i NONE -n -X -Z -e -s -S Xscript'))
|
||||||
|
call assert_equal(['done'], readfile('Xdone'))
|
||||||
|
|
||||||
call delete('Xdone')
|
call delete('Xdone')
|
||||||
endfunc
|
endfunc
|
||||||
|
|
||||||
@ -4304,4 +4320,5 @@ func Test_normal_go()
|
|||||||
|
|
||||||
bwipe!
|
bwipe!
|
||||||
endfunc
|
endfunc
|
||||||
|
|
||||||
" vim: shiftwidth=2 sts=2 expandtab nofoldenable
|
" vim: shiftwidth=2 sts=2 expandtab nofoldenable
|
||||||
|
Reference in New Issue
Block a user