mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-05 09:26:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

shada,functests: Fix v:hlsearch saving/restoring handling

Browse Source
This commit is contained in:
ZyX
2015-08-23 19:41:00 +03:00
parent e1dc9ed464
commit 915a298223
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/nvim/shada.c
View File

@@ -2531,7 +2531,7 @@ static ShaDaWriteResult shada_write(ShaDaWriteDef *const sd_writer,
.offset = pat.off.off, .offset = pat.off.off,
.is_last_used = search_was_last_used(), .is_last_used = search_was_last_used(),
.is_substitute_pattern = false, .is_substitute_pattern = false,
.highlighted = (!no_hlsearch && find_shada_parameter('h') != NULL), .highlighted = !(no_hlsearch || find_shada_parameter('h') != NULL),
.pat = (char *) pat.pat, .pat = (char *) pat.pat,
.additional_data = pat.additional_data, .additional_data = pat.additional_data,
} }

10
test/functional/shada/history_spec.lua
View File

@@ -128,15 +128,16 @@ describe('ShaDa support code', function()
end) end)
it('saves v:hlsearch=1', function() it('saves v:hlsearch=1', function()
nvim_command('set hlsearch') nvim_command('set hlsearch shada-=h')
nvim_feed('/test\n') nvim_feed('/test\n')
eq(1, nvim_eval('v:hlsearch'))
nvim_command('qall') nvim_command('qall')
reset() reset()
eq(1, nvim_eval('v:hlsearch')) eq(1, nvim_eval('v:hlsearch'))
end) end)
it('saves v:hlsearch=0 with :nohl', function() it('saves v:hlsearch=0 with :nohl', function()
nvim_command('set hlsearch') nvim_command('set hlsearch shada-=h')
nvim_feed('/test\n') nvim_feed('/test\n')
nvim_command('nohlsearch') nvim_command('nohlsearch')
nvim_command('qall') nvim_command('qall')
@@ -144,9 +145,10 @@ describe('ShaDa support code', function()
eq(0, nvim_eval('v:hlsearch')) eq(0, nvim_eval('v:hlsearch'))
end) end)
it('saves v:hlsearch=0 with :set viminfo-=h', function() it('saves v:hlsearch=0 with default &shada', function()
nvim_command('set hlsearch viminfo-=h') nvim_command('set hlsearch')
nvim_feed('/test\n') nvim_feed('/test\n')
eq(1, nvim_eval('v:hlsearch'))
nvim_command('qall') nvim_command('qall')
reset() reset()
eq(0, nvim_eval('v:hlsearch')) eq(0, nvim_eval('v:hlsearch'))