aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-28 04:24:06 -04:00
Code Activity

updated for version 7.4.537

Browse Source 
Problem:    Value of v:hlsearch reflects an internal variable.
Solution:   Make the value reflect whether search highlighting is actually
            displayed. (Christian Brabandt)
This commit is contained in:
Bram Moolenaar
2014-11-27 19:14:49 +01:00
parent f1e30ccb82
commit 76440e2efe
5 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
runtime/doc/eval.txt
View File

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

3
src/testdir/test101.in
View File

@@ -25,6 +25,9 @@ n:AddR
:AddR :AddR
/ /
:AddR :AddR
:set nohls
/
:AddR
:let r1=r[0][0] :let r1=r[0][0]
:" I guess it is not guaranteed that screenattr outputs always the same character :" 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")') :call map(r, 'v:val[1].":".(v:val[0]==r1?"highlighted":"not highlighted")')

1
src/testdir/test101.ok
View File

@@ -8,4 +8,5 @@ start:
1:highlighted 1:highlighted
0:not highlighted 0:not highlighted
1:highlighted 1:highlighted
0:not highlighted
Vim(let):E706: Vim(let):E706:

2
src/version.c
View File

@@ -741,6 +741,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
537,
/**/ /**/
536, 536,
/**/ /**/

4
src/vim.h
View File

@@ -1998,7 +1998,7 @@ typedef int VimClipboard; /* This is required for the prototypes. */
#ifndef FEAT_VIRTUALEDIT #ifndef FEAT_VIRTUALEDIT
# define getvvcol(w, p, s, c, e) getvcol(w, p, s, c, e) # 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 # define virtual_op FALSE
#endif #endif
@@ -2277,7 +2277,7 @@ typedef int VimClipboard; /* This is required for the prototypes. */
#define AUTOLOAD_CHAR '#' #define AUTOLOAD_CHAR '#'
#ifdef FEAT_EVAL #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 #else
# define SET_NO_HLSEARCH(flag) no_hlsearch = (flag) # define SET_NO_HLSEARCH(flag) no_hlsearch = (flag)
#endif #endif