From ccb148ac63941feba879ea4678aa4713d81494f2 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Mon, 26 Jul 2021 21:11:32 +0200
Subject: [PATCH] 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 | 2 +-
 src/version.c  | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/ex_getln.c b/src/ex_getln.c
index 22f1cf6d2f..40b8886a04 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 190059e145..945d8e98d6 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,
 /**/