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.

diff --git a/src/ex_getln.c b/src/ex_getln.c
index 22f1cf6d2f38517e671392fa07172a4e6b24f170..40b8886a049c5798bb1d18d4924ca197228c9570 100644 (file)
--- a/src/ex_getln.c
+++ b/src/ex_getln.c
@@ -2390,7 +2390,7 @@ cmdline_changed:
            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
 

diff --git a/src/version.c b/src/version.c
index 190059e145b6398b17598d2018523761dd5fb965..945d8e98d67d177526c55ee9eb05101080d33571 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    3225,
 /**/
     3224,
 /**/