kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-19 10:45:16 -07:00
Code Issues Packages Projects Releases Wiki Activity

fix(move): check the correct buffer (#25698)

Browse Source
This commit is contained in:
zeertzjq 2023-10-18 10:34:55 +08:00 committed by GitHub
parent bbc74d51ad
commit 366d0c7887
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/nvim/move.c
View File

@ -247,7 +247,7 @@ void update_topline(win_T *wp)
int old_topfill = wp->w_topfill;
// If the buffer is empty, always set topline to 1.
if (buf_is_empty(curbuf)) { // special case - file is empty
if (buf_is_empty(wp->w_buffer)) { // special case - file is empty
if (wp->w_topline != 1) {
redraw_later(wp, UPD_NOT_VALID);
}

30
test/functional/ui/inccommand_spec.lua
View File

@ -3095,6 +3095,36 @@ it(':substitute with inccommand works properly if undo is not synced #20029', fu
baz]])
end)
it(':substitute with inccommand does not unexpectedly change viewport #25697', function()
clear()
local screen = Screen.new(45, 5)
common_setup(screen, 'nosplit', long_multiline_text)
command('vnew | tabnew | tabclose')
screen:expect([[
^ │£ m n |
{15:~ }│t œ ¥ |
{15:~ }│ |
{11:[No Name] }{10:[No Name] [+] }|
|
]])
feed(':s/')
screen:expect([[
│£ m n |
{15:~ }│t œ ¥ |
{15:~ }│ |
{11:[No Name] }{10:[No Name] [+] }|
:s/^ |
]])
feed('<Esc>')
screen:expect([[
^ │£ m n |
{15:~ }│t œ ¥ |
{15:~ }│ |
{11:[No Name] }{10:[No Name] [+] }|
|
]])
end)
it('long :%s/ with inccommand does not collapse cmdline', function()
clear()
local screen = Screen.new(10,5)