diff options
| author | Aufar Gilbran <aufargilbran@gmail.com> | 2020-08-19 00:51:47 +0800 |
|---|---|---|
| committer | Aufar Gilbran <aufargilbran@gmail.com> | 2020-09-11 10:37:52 +0800 |
| commit | f7d2e37e36dafd3a45d343c771d2ff53f6a4b875 (patch) | |
| tree | 2f53de05e4fbe3574bcde4a3ae59d8633dd5ff18 /src/nvim/ex_getln.c | |
| parent | 112092fa1598fbfa9dae723da5e52d2dec8da2f0 (diff) | |
| download | rneovim-f7d2e37e36dafd3a45d343c771d2ff53f6a4b875.tar.gz rneovim-f7d2e37e36dafd3a45d343c771d2ff53f6a4b875.tar.bz2 rneovim-f7d2e37e36dafd3a45d343c771d2ff53f6a4b875.zip | |
vim-patch:8.1.0399: 'hlsearch' highlight remains in other window
Problem: 'hlsearch' highlight remains in other window after cancelling
command.
Solution: Redraw all windows. Also remove unnecessary delays. (closes vim/vim#3437)
https://github.com/vim/vim/commit/65985ac998713dfe0f0ff1dd49c5e3e8f17f4870
Diffstat (limited to 'src/nvim/ex_getln.c')
| -rw-r--r-- | src/nvim/ex_getln.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/nvim/ex_getln.c b/src/nvim/ex_getln.c index 960b7cf03f..6ef8a9b5bf 100644 --- a/src/nvim/ex_getln.c +++ b/src/nvim/ex_getln.c @@ -529,7 +529,8 @@ static void may_do_incsearch_highlighting(int firstc, long count, if (!use_last_pat) { next_char = ccline.cmdbuff[skiplen + patlen]; ccline.cmdbuff[skiplen + patlen] = NUL; - if (empty_pattern(ccline.cmdbuff)) { + if (empty_pattern(ccline.cmdbuff) && !no_hlsearch) { + redraw_all_later(SOME_VALID); set_no_hlsearch(true); } ccline.cmdbuff[skiplen + patlen] = next_char; @@ -624,10 +625,9 @@ static void finish_incsearch_highlighting(int gotesc, incsearch_state_T *s, p_magic = s->magic_save; validate_cursor(); // needed for TAB + redraw_all_later(SOME_VALID); if (call_update_screen) { update_screen(SOME_VALID); - } else { - redraw_all_later(SOME_VALID); } } } |