diff options
| -rw-r--r-- | src/nvim/shada.c | 10 | ||||
| -rw-r--r-- | test/functional/shada/history_spec.lua | 13 |
2 files changed, 18 insertions, 5 deletions
diff --git a/src/nvim/shada.c b/src/nvim/shada.c index 7e7e7cfdf7..4b34153164 100644 --- a/src/nvim/shada.c +++ b/src/nvim/shada.c @@ -2705,6 +2705,11 @@ static ShaDaWriteResult shada_write(ShaDaWriteDef *const sd_writer, } while (var_iter != NULL); } + // Initialize jump list + setpcmark(); + cleanup_jumplist(curwin, false); + wms->jumps_size = shada_init_jumps(wms->jumps, &removable_bufs); + const bool search_highlighted = !(no_hlsearch || find_shada_parameter('h') != NULL); const bool search_last_used = search_was_last_used(); @@ -2736,11 +2741,6 @@ static ShaDaWriteResult shada_write(ShaDaWriteDef *const sd_writer, }; } - // Initialize jump list - setpcmark(); - cleanup_jumplist(curwin, false); - wms->jumps_size = shada_init_jumps(wms->jumps, &removable_bufs); - // Initialize global marks if (dump_global_marks) { const void *global_mark_iter = NULL; diff --git a/test/functional/shada/history_spec.lua b/test/functional/shada/history_spec.lua index c4be9e563d..78b5c77857 100644 --- a/test/functional/shada/history_spec.lua +++ b/test/functional/shada/history_spec.lua @@ -224,4 +224,17 @@ describe('ShaDa support code', function() eq('', funcs.histget('/', -1)) end) + it('does not crash when dumping last search pattern (#10945)', function() + nvim_command('edit Xtest-functional-shada-history_spec') + -- Save jump list + nvim_command('wshada') + -- Wipe out buffer list (jump list entry gets removed) + nvim_command('%bwipeout') + -- Restore jump list + nvim_command('rshada') + nvim_command('silent! /pat/') + nvim_command('au BufNew * echo') + nvim_command('wshada') + end) + end) |