mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-07 10:26:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.0.1768: SET_NO_HLSEARCH() used in a wrong way

Browse Source 
Problem:    SET_NO_HLSEARCH() used in a wrong way.
Solution:   Make it a function. (suggested by Dominique Pelle,
            closes vim/vim#2850)
451fc7b954
This commit is contained in:
Jan Edmund Lazo
2019-09-02 15:56:29 -04:00
parent 6434a0bf99
commit 07b209b1fe
9 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/nvim/search.c
View File

@@ -100,7 +100,7 @@ static struct spat saved_spats[2];
// searching
static struct spat saved_last_search_spat;
static int saved_last_idx = 0;
static int saved_no_hlsearch = 0;
static bool saved_no_hlsearch = false;
static char_u *mr_pattern = NULL; // pattern used by search_regcomp()
static int mr_pattern_alloced = false; // mr_pattern was allocated
@@ -248,7 +248,7 @@ void save_re_pat(int idx, char_u *pat, int magic)
/* If 'hlsearch' set and search pat changed: need redraw. */
if (p_hls)
redraw_all_later(SOME_VALID);
SET_NO_HLSEARCH(FALSE);
set_no_hlsearch(false);
}
}
@@ -281,7 +281,7 @@ void restore_search_patterns(void)
free_spat(&spats[1]);
spats[1] = saved_spats[1];
last_idx = saved_last_idx;
SET_NO_HLSEARCH(saved_no_hlsearch);
set_no_hlsearch(saved_no_hlsearch);
}
}
@@ -330,7 +330,7 @@ void restore_last_search_pattern(void)
spats[RE_SEARCH] = saved_last_search_spat;
set_vv_searchforward();
last_idx = saved_last_idx;
SET_NO_HLSEARCH(saved_no_hlsearch);
set_no_hlsearch(saved_no_hlsearch);
}
char_u *last_search_pattern(void)
@@ -1048,7 +1048,7 @@ int do_search(
*/
if (no_hlsearch && !(options & SEARCH_KEEP)) {
redraw_all_later(SOME_VALID);
SET_NO_HLSEARCH(FALSE);
set_no_hlsearch(false);
}
/*