From 5e4fcc8b36cc9a618f5476b939830e0c397e1066 Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Sun, 1 Aug 2021 10:38:51 -0400 Subject: [PATCH] vim-patch:8.2.3225: incsearch highlighting is attempted halfway a mapping Problem: Incsearch highlighting is attempted halfway a mapping. Solution: Only do incsearch highlighting if keys were typed or there is no more typeahead. https://github.com/vim/vim/commit/ccb148ac63941feba879ea4678aa4713d81494f2 --- src/nvim/ex_getln.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/nvim/ex_getln.c b/src/nvim/ex_getln.c index d3a5c383e5..2b3d773ca4 100644 --- a/src/nvim/ex_getln.c +++ b/src/nvim/ex_getln.c @@ -2267,7 +2267,7 @@ static int command_line_changed(CommandLineState *s) close_preview_windows(); update_screen(SOME_VALID); // Clear 'inccommand' preview. } else { - if (s->xpc.xp_context == EXPAND_NOTHING) { + if (s->xpc.xp_context == EXPAND_NOTHING && (KeyTyped || vpeekc() == NUL)) { may_do_incsearch_highlighting(s->firstc, s->count, &s->is_state); } }