From 76440e2efe9e3582e9943d01183ec8b2f3e4eb4b Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Thu, 27 Nov 2014 19:14:49 +0100 Subject: 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) --- src/testdir/test101.in | 3 +++ src/testdir/test101.ok | 1 + src/version.c | 2 ++ src/vim.h | 4 ++-- 4 files changed, 8 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/testdir/test101.in b/src/testdir/test101.in index 04c934f2c..31fc33439 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 3ed7436cf..f063b85de 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 5915f95eb..1f7000f01 100644 --- 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 2a6d9a044..7f3e393d5 100644 --- 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 -- cgit v1.2.3