Mercurial > vim

changeset 25376:485ae4421331 v8.2.3225

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.3225: incsearch highlighting is attempted halfway a mapping Commit: https://github.com/vim/vim/commit/ccb148ac63941feba879ea4678aa4713d81494f2 Author: Bram Moolenaar <Bram@vim.org> Date: Mon Jul 26 21:11:32 2021 +0200 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.
author Bram Moolenaar <Bram@vim.org>
date Mon, 26 Jul 2021 21:15:08 +0200
parents 68bfc73d8da6
children 5197d46bc088
files src/ex_getln.c src/version.c
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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
 
--- a/src/version.c
+++ b/src/version.c
@@ -756,6 +756,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    3225,
+/**/
     3224,
 /**/
     3223,