Mercurial > vim

diff src/vim.h @ 6413:01c668384bcc v7.4.537

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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)
author Bram Moolenaar <bram@vim.org>
date Thu, 27 Nov 2014 19:14:49 +0100
parents 96a4fa8e530c
children de877dab1c31
line wrap: on
line diff
--- a/src/vim.h
+++ b/src/vim.h
@@ -1998,7 +1998,7 @@ typedef int VimClipboard;	/* This is req
 
 #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 req
 #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