aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/nvim/version.c2
-rw-r--r--src/nvim/vim.h2
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 */