aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2021-08-01 10:38:51 -0400
committerJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2021-08-01 11:26:54 -0400
commit5e4fcc8b36cc9a618f5476b939830e0c397e1066 (patch)
tree89d00e948b7a518643059aafd8f87550c6c53275
parentd95e28f5ce9c8a156423bf29900f159ce313de35 (diff)
downloadrneovim-5e4fcc8b36cc9a618f5476b939830e0c397e1066.tar.gz
rneovim-5e4fcc8b36cc9a618f5476b939830e0c397e1066.tar.bz2
rneovim-5e4fcc8b36cc9a618f5476b939830e0c397e1066.zip
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. https://github.com/vim/vim/commit/ccb148ac63941feba879ea4678aa4713d81494f2
-rw-r--r--src/nvim/ex_getln.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nvim/ex_getln.c b/src/nvim/ex_getln.c
index d3a5c383e5..2b3d773ca4 100644
--- a/src/nvim/ex_getln.c
+++ b/src/nvim/ex_getln.c
@@ -2267,7 +2267,7 @@ static int command_line_changed(CommandLineState *s)
close_preview_windows();
update_screen(SOME_VALID); // Clear 'inccommand' preview.
} else {
- if (s->xpc.xp_context == EXPAND_NOTHING) {
+ if (s->xpc.xp_context == EXPAND_NOTHING && (KeyTyped || vpeekc() == NUL)) {
may_do_incsearch_highlighting(s->firstc, s->count, &s->is_state);
}
}