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

runtime/doc/eval.txt

@@ -1455,10 +1455,10 @@ v:foldstart	Used for 'foldtext': first line of closed fold.
 		Read-only in the |sandbox|. |fold-foldtext|
 
 					*v:hlsearch* *hlsearch-variable*
-v:hlsearch	Variable that determines whether search highlighting is on. 
-		Makes sense only if 'hlsearch' is enabled which requires 
-		|+extra_search|. Setting this variable to zero acts the like 
-		|:nohlsearch| command, setting it to one acts like >
+v:hlsearch	Variable that indicates whether search highlighting is on.
+		Setting it makes sense only if 'hlsearch' is enabled. Setting
+		this variable to zero acts like the |:nohlsearch| command,
+		setting it to one acts like >
 			let &hlsearch = &hlsearch
 <
 					*v:insertmode* *insertmode-variable*

src/nvim/version.c

@@ -232,7 +232,7 @@ static int included_patches[] = {
   //540 NA
   //539,
   538,
-  //537,
+  537,
   536,
   //535,
   //534 NA

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

test/functional/legacy/101_hlsearch_spec.lua

@@ -32,6 +32,9 @@ describe('v:hlsearch', function()
     execute('AddR')
     execute('/')
     execute('AddR')
+    execute('set nohls')
+    execute('/')
+    execute('AddR')
     execute('let r1=r[0][0]')
 
     -- I guess it is not guaranteed that screenattr outputs always the same character
@@ -58,6 +61,7 @@ describe('v:hlsearch', function()
       1:highlighted
       0:not highlighted
       1:highlighted
+      0:not highlighted
       Vim(let):E706:]])
   end)
 end)