diff options
| author | David Bürgin <676c7473@gmail.com> | 2015-04-25 20:01:33 +0200 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2015-04-27 02:10:57 -0400 |
| commit | 5a1a2ba783ba174567ff1c1044b9f0b01b61a0fb (patch) | |
| tree | 341ddc468821cc469e0ae894f8de30d564a5795d /src | |
| parent | af863d46a99aa5d14ff7524dbf17764520554f2b (diff) | |
| download | rneovim-5a1a2ba783ba174567ff1c1044b9f0b01b61a0fb.tar.gz rneovim-5a1a2ba783ba174567ff1c1044b9f0b01b61a0fb.tar.bz2 rneovim-5a1a2ba783ba174567ff1c1044b9f0b01b61a0fb.zip | |
vim-patch:7.4.537 #2509
Problem: Value of v:hlsearch reflects an internal variable.
Solution: Make the value reflect whether search highlighting is actually
displayed. (Christian Brabandt)
https://github.com/vim/vim/releases/tag/v7-4-537
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/version.c | 2 | ||||
| -rw-r--r-- | src/nvim/vim.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/nvim/version.c b/src/nvim/version.c index 8ef6ae8ee8..d1ba6e473e 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -232,7 +232,7 @@ static int included_patches[] = { //540 NA //539, 538, - //537, + 537, 536, //535, //534 NA diff --git a/src/nvim/vim.h b/src/nvim/vim.h index 796267dd0d..41fcff129c 100644 --- a/src/nvim/vim.h +++ b/src/nvim/vim.h @@ -351,6 +351,6 @@ enum { #include "nvim/ex_cmds_defs.h" /* Ex command defines */ # define SET_NO_HLSEARCH(flag) no_hlsearch = (flag); set_vim_var_nr( \ - VV_HLSEARCH, !no_hlsearch) + VV_HLSEARCH, !no_hlsearch && p_hls) #endif /* NVIM_VIM_H */ |