diff options
| author | ZyX <kp-pav@yandex.ru> | 2015-08-23 19:41:00 +0300 |
|---|---|---|
| committer | ZyX <kp-pav@yandex.ru> | 2015-10-08 22:01:04 +0300 |
| commit | 915a29822335905b79a2dacc73ce6bd219367eeb (patch) | |
| tree | 8dc47eba31687f39843ac5d441fc80be8311e2ef | |
| parent | e1dc9ed4641953977028650d8b7300a8680bdf55 (diff) | |
| download | rneovim-915a29822335905b79a2dacc73ce6bd219367eeb.tar.gz rneovim-915a29822335905b79a2dacc73ce6bd219367eeb.tar.bz2 rneovim-915a29822335905b79a2dacc73ce6bd219367eeb.zip | |
shada,functests: Fix v:hlsearch saving/restoring handling
| -rw-r--r-- | src/nvim/shada.c | 2 | ||||
| -rw-r--r-- | test/functional/shada/history_spec.lua | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/nvim/shada.c b/src/nvim/shada.c index 931636b030..938a76dbd8 100644 --- a/src/nvim/shada.c +++ b/src/nvim/shada.c @@ -2531,7 +2531,7 @@ static ShaDaWriteResult shada_write(ShaDaWriteDef *const sd_writer, .offset = pat.off.off, .is_last_used = search_was_last_used(), .is_substitute_pattern = false, - .highlighted = (!no_hlsearch && find_shada_parameter('h') != NULL), + .highlighted = !(no_hlsearch || find_shada_parameter('h') != NULL), .pat = (char *) pat.pat, .additional_data = pat.additional_data, } diff --git a/test/functional/shada/history_spec.lua b/test/functional/shada/history_spec.lua index 9ec7f9c256..599330d6eb 100644 --- a/test/functional/shada/history_spec.lua +++ b/test/functional/shada/history_spec.lua @@ -128,15 +128,16 @@ describe('ShaDa support code', function() end) it('saves v:hlsearch=1', function() - nvim_command('set hlsearch') + nvim_command('set hlsearch shada-=h') nvim_feed('/test\n') + eq(1, nvim_eval('v:hlsearch')) nvim_command('qall') reset() eq(1, nvim_eval('v:hlsearch')) end) it('saves v:hlsearch=0 with :nohl', function() - nvim_command('set hlsearch') + nvim_command('set hlsearch shada-=h') nvim_feed('/test\n') nvim_command('nohlsearch') nvim_command('qall') @@ -144,9 +145,10 @@ describe('ShaDa support code', function() eq(0, nvim_eval('v:hlsearch')) end) - it('saves v:hlsearch=0 with :set viminfo-=h', function() - nvim_command('set hlsearch viminfo-=h') + it('saves v:hlsearch=0 with default &shada', function() + nvim_command('set hlsearch') nvim_feed('/test\n') + eq(1, nvim_eval('v:hlsearch')) nvim_command('qall') reset() eq(0, nvim_eval('v:hlsearch')) |