updated for version 7.4.537

Problem:    Value of v:hlsearch reflects an internal variable.
Solution:   Make the value reflect whether search highlighting is actually
            displayed. (Christian Brabandt)

diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 829d4eea8db61c81dac0702c14157174e9d630c7..7b3b9589b8bde3b4b9146f04cc6e078c3a9a3b65 100644 (file)
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -1457,10 +1457,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 which
+               requires |+extra_search|. Setting this variable to zero acts
+               the like |:nohlsearch| command, setting it to one acts like >
                        let &hlsearch = &hlsearch
 <
                                        *v:insertmode* *insertmode-variable*

diff --git a/src/testdir/test101.in b/src/testdir/test101.in
index 04c934f2c5d9edf6df849c22a69479e1b30bec2a..31fc334393106ac86b9be29dbca66efe8fa74e6a 100644 (file)
--- a/src/testdir/test101.in
+++ b/src/testdir/test101.in
@@ -25,6 +25,9 @@ n:AddR
 :AddR
 /
 :AddR
+:set nohls
+/
+:AddR
 :let r1=r[0][0]
 :" I guess it is not guaranteed that screenattr outputs always the same character
 :call map(r, 'v:val[1].":".(v:val[0]==r1?"highlighted":"not highlighted")')

diff --git a/src/testdir/test101.ok b/src/testdir/test101.ok
index 3ed7436cf7700ffbf5a798463fb9b6de16520104..f063b85dea5ff3fd2ceec1c520b81162d2387399 100644 (file)
--- a/src/testdir/test101.ok
+++ b/src/testdir/test101.ok
@@ -8,4 +8,5 @@ start:
 1:highlighted
 0:not highlighted
 1:highlighted
+0:not highlighted
 Vim(let):E706:

diff --git a/src/version.c b/src/version.c
index 5915f95eb88237db172bcf1483935433c134ac00..1f7000f0191473657af6fd3ca6004535787f8559 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    537,
 /**/
     536,
 /**/

diff --git a/src/vim.h b/src/vim.h
index 2a6d9a044597de559672d340a2372f5401dc7032..7f3e393d53370959ff53133ec991b9514d2ca26f 100644 (file)
--- a/src/vim.h
+++ b/src/vim.h
@@ -1998,7 +1998,7 @@ typedef int VimClipboard; /* This is required for the prototypes. */
 
 #ifndef FEAT_VIRTUALEDIT
 # define getvvcol(w, p, s, c, e) getvcol(w, p, s, c, e)
-# define virtual_active() 0
+# define virtual_active() FALSE
 # define virtual_op FALSE
 #endif
 
@@ -2277,7 +2277,7 @@ typedef int VimClipboard; /* This is required for the prototypes. */
 #define AUTOLOAD_CHAR '#'
 
 #ifdef FEAT_EVAL
-# define SET_NO_HLSEARCH(flag) no_hlsearch = (flag); set_vim_var_nr(VV_HLSEARCH, !no_hlsearch)
+# define SET_NO_HLSEARCH(flag) no_hlsearch = (flag); set_vim_var_nr(VV_HLSEARCH, !no_hlsearch && p_hls)
 #else
 # define SET_NO_HLSEARCH(flag) no_hlsearch = (flag)
 #endif