summaryrefslogtreecommitdiff
path: root/src/vim.h
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2014-11-27 19:14:49 +0100
committerBram Moolenaar <Bram@vim.org>2014-11-27 19:14:49 +0100
commit76440e2efe9e3582e9943d01183ec8b2f3e4eb4b (patch)
treea518052ae02428fa26e858b0c1c85eff26939a27 /src/vim.h
parentf1e30ccb822c56693881da199c7efbe6c9c0dca1 (diff)
downloadvim-git-76440e2efe9e3582e9943d01183ec8b2f3e4eb4b.tar.gz
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)
Diffstat (limited to 'src/vim.h')
-rw-r--r--src/vim.h4
1 files changed, 2 insertions, 2 deletions
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