From: Bram Moolenaar <Bram@vim.org>
Date: Mon, 26 Jul 2021 19:11:32 +0000 (+0200)
Subject: patch 8.2.3225: incsearch highlighting is attempted halfway a mapping
X-Git-Tag: v8.2.3225
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ccb148ac63941feba879ea4678aa4713d81494f2;p=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.
---

diff --git a/src/ex_getln.c b/src/ex_getln.c
index 22f1cf6d2..40b8886a0 100644
--- 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 190059e14..945d8e98d 100644
--- 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,
 /**/