IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

shada: Save current cursor position before saving jumps

Browse Source
This commit is contained in:
ZyX 2016-07-17 15:28:14 +03:00
parent d8a97d7b79
commit 81ef9f55ae
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/nvim/shada.c
View File

@ -2591,9 +2591,12 @@ static ShaDaWriteResult shada_write(ShaDaWriteDef *const sd_writer,
// Initialize jump list // Initialize jump list
const void *jump_iter = NULL; const void *jump_iter = NULL;
do { do {
xfmark_T fm; setpcmark();
cleanup_jumplist(); cleanup_jumplist();
xfmark_T fm;
jump_iter = mark_jumplist_iter(jump_iter, curwin, &fm); jump_iter = mark_jumplist_iter(jump_iter, curwin, &fm);
const buf_T *const buf = (fm.fmark.fnum == 0 const buf_T *const buf = (fm.fmark.fnum == 0
? NULL ? NULL
: buflist_findnr(fm.fmark.fnum)); : buflist_findnr(fm.fmark.fnum));

13
test/functional/shada/marks_spec.lua
View File

@ -153,6 +153,19 @@ describe('ShaDa support code', function()
eq(saved, redir_exec('jumps')) eq(saved, redir_exec('jumps'))
end) end)
it('when dumping jump list also dumps current position', function()
nvim_command('edit ' .. testfilename)
nvim_command('normal! G')
nvim_command('split ' .. testfilename_2)
nvim_command('normal! G')
nvim_command('wshada')
nvim_command('quit')
nvim_command('rshada')
nvim_command('normal! \15') -- <C-o>
eq(testfilename_2, funcs.bufname('%'))
eq({2, 0}, curwinmeths.get_cursor())
end)
it('is able to dump and restore jump list with different times (slow!)', it('is able to dump and restore jump list with different times (slow!)',
function() function()
nvim_command('edit ' .. testfilename_2) nvim_command('edit ' .. testfilename_2)