From 5a1a2ba783ba174567ff1c1044b9f0b01b61a0fb Mon Sep 17 00:00:00 2001
From: David Bürgin <676c7473@gmail.com>
Date: Sat, 25 Apr 2015 20:01:33 +0200
Subject: 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
---
 src/nvim/version.c | 2 +-
 src/nvim/vim.h     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

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 */
-- 
cgit