To: vim_dev@googlegroups.com Subject: Patch 8.2.3225 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.3225 Problem: Incsearch highlighting is attempted halfway a mapping. Solution: Only do incsearch highlighting if keys were typed or there is no more typeahead. Files: src/ex_getln.c *** ../vim-8.2.3224/src/ex_getln.c 2021-06-27 22:03:28.641707728 +0200 --- src/ex_getln.c 2021-07-26 20:40:50.652455730 +0200 *************** *** 2390,2396 **** trigger_cmd_autocmd(cmdline_type, EVENT_CMDLINECHANGED); #ifdef FEAT_SEARCH_EXTRA ! if (xpc.xp_context == EXPAND_NOTHING) may_do_incsearch_highlighting(firstc, count, &is_state); #endif --- 2390,2396 ---- trigger_cmd_autocmd(cmdline_type, EVENT_CMDLINECHANGED); #ifdef FEAT_SEARCH_EXTRA ! if (xpc.xp_context == EXPAND_NOTHING && (KeyTyped || vpeekc() == NUL)) may_do_incsearch_highlighting(firstc, count, &is_state); #endif *** ../vim-8.2.3224/src/version.c 2021-07-26 21:10:07.977693943 +0200 --- src/version.c 2021-07-26 21:11:10.777558089 +0200 *************** *** 757,758 **** --- 757,760 ---- { /* Add new patch number below this line */ + /**/ + 3225, /**/ -- "Marriage is the process of finding out what kind of man your wife would have preferred" /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// \\\ \\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///