mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2026-02-19 01:48:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(undo): u_savecommon uses wrong buffer

Browse Source 
Problem: u_savecommon with reload = true wrongly uses curbuf.

Solution: use buf. Fix comments.
This commit is contained in:
Sean Dewar
2026-02-17 00:06:03 +00:00
parent 16bf7652b7
commit ce9dbd398b
2 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/nvim/undo.c
View File

@@ -382,7 +382,7 @@ int u_savecommon(buf_T *buf, linenr_T top, linenr_T bot, linenr_T newbot, bool r
u_entry_T *prev_uep;
linenr_T size = bot - top - 1;
// If curbuf->b_u_synced == true make a new header.
// If buf->b_u_synced == true make a new header.
if (buf->b_u_synced) {
// Need to create new entry in b_changelist.
buf->b_new_change = true;
@@ -401,7 +401,7 @@ int u_savecommon(buf_T *buf, linenr_T top, linenr_T bot, linenr_T newbot, bool r
}
// If we undid more than we redid, move the entry lists before and
// including curbuf->b_u_curhead to an alternate branch.
// including buf->b_u_curhead to an alternate branch.
u_header_T *old_curhead = buf->b_u_curhead;
if (old_curhead != NULL) {
buf->b_u_newhead = old_curhead->uh_next.ptr;
@@ -608,7 +608,7 @@ int u_savecommon(buf_T *buf, linenr_T top, linenr_T bot, linenr_T newbot, bool r
buf->b_u_newhead->uh_entry = uep;
if (reload) {
// buffer was reloaded, notify text change subscribers
curbuf->b_u_newhead->uh_flags |= UH_RELOAD;
buf->b_u_newhead->uh_flags |= UH_RELOAD;
}
buf->b_u_synced = false;
undo_undoes = false;

19
test/functional/editor/undo_spec.lua
View File

@@ -225,3 +225,22 @@ describe(':undo! command', function()
)
end)
end)
describe('undo', function()
before_each(clear)
it('u_savecommon uses correct buffer with reload = true', function()
-- Easiest to repro in a prompt buffer. prompt_setprompt's buffer must not yet have an undo
-- header to trigger this. Will crash if it wrongly uses the unloaded curbuf in nvim_buf_call,
-- as that has no undo buffer.
eq(0, #fn.undotree().entries)
exec_lua(function()
local buf = vim.api.nvim_get_current_buf()
vim.bo.buftype = 'prompt'
vim.api.nvim_buf_call(vim.fn.bufadd(''), function()
vim.fn.prompt_setprompt(buf, 'hej > ')
end)
end)
eq('hej > ', fn.prompt_getprompt(''))
end)
end)