diff options
| author | Bram Moolenaar <Bram@vim.org> | 2014-11-27 19:14:49 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2014-11-27 19:14:49 +0100 |
| commit | 76440e2efe9e3582e9943d01183ec8b2f3e4eb4b (patch) | |
| tree | a518052ae02428fa26e858b0c1c85eff26939a27 | |
| parent | f1e30ccb822c56693881da199c7efbe6c9c0dca1 (diff) | |
updated for version 7.4.537v7.4.537
Problem: Value of v:hlsearch reflects an internal variable.
Solution: Make the value reflect whether search highlighting is actually
displayed. (Christian Brabandt)
| -rw-r--r-- | runtime/doc/eval.txt | 8 | ||||
| -rw-r--r-- | src/testdir/test101.in | 3 | ||||
| -rw-r--r-- | src/testdir/test101.ok | 1 | ||||
| -rw-r--r-- | src/version.c | 2 | ||||
| -rw-r--r-- | src/vim.h | 4 |
5 files changed, 12 insertions, 6 deletions
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index 829d4eea8d..7b3b9589b8 100644 --- 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 04c934f2c5..31fc334393 100644 --- 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 3ed7436cf7..f063b85dea 100644 --- 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 5915f95eb8..1f7000f019 100644 --- a/src/version.c +++ b/src/version.c @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 537, +/**/ 536, /**/ 535, @@ -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 |