commit ccb148ac63941feba879ea4678aa4713d81494f2
author Bram Moolenaar <Bram@vim.org> Mon Jul 26 21:11:32 2021 +0200
committer Bram Moolenaar <Bram@vim.org> Mon Jul 26 21:11:32 2021 +0200
tree c12bcb93b37011265059ad5c560707005daa45cb
parent 678b207fb111840fec1f0dc43910613ba106b90d

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.

src/ex_getln.c

diff --git a/src/ex_getln.c b/src/ex_getln.c
index 22f1cf6..40b8886 100644
--- a/src/ex_getln.c
+++ b/src/ex_getln.c
@@ -2390,7 +2390,7 @@
 	    trigger_cmd_autocmd(cmdline_type, EVENT_CMDLINECHANGED);
 
 #ifdef FEAT_SEARCH_EXTRA
-	if (xpc.xp_context == EXPAND_NOTHING)
+	if (xpc.xp_context == EXPAND_NOTHING && (KeyTyped || vpeekc() == NUL))
 	    may_do_incsearch_highlighting(firstc, count, &is_state);
 #endif
 

src/version.c

diff --git a/src/version.c b/src/version.c
index 190059e..945d8e9 100644
--- a/src/version.c
+++ b/src/version.c
@@ -756,6 +756,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    3225,
+/**/
     3224,
 /**/
     3223,