Patch 8.2.4328

4 views
Skip to first unread message

Bram Moolenaar

unread,
Feb 8, 2022, 12:41:32 PM2/8/22
to vim...@googlegroups.com

Patch 8.2.4328
Problem: Command line complete matches cleard when typing character.
(Dominique Pellé)
Solution: Only remove a popup menu if there is one.
Files: src/ex_getln.c, src/testdir/test_cmdline.vim,
src/testdir/dumps/Test_wildmenu_pum_30.dump,
src/testdir/dumps/Test_wildmenu_pum_31.dump


*** ../vim-8.2.4327/src/ex_getln.c 2022-02-08 12:07:41.831496906 +0000
--- src/ex_getln.c 2022-02-08 17:38:13.241216072 +0000
***************
*** 1883,1889 ****
&& c != Ctrl_L)
{
#ifdef FEAT_WILDMENU
! cmdline_pum_remove();
#endif
(void)ExpandOne(&xpc, NULL, NULL, 0, WILD_FREE);
did_wild_list = FALSE;
--- 1883,1890 ----
&& c != Ctrl_L)
{
#ifdef FEAT_WILDMENU
! if (cmdline_pum_active())
! cmdline_pum_remove();
#endif
(void)ExpandOne(&xpc, NULL, NULL, 0, WILD_FREE);
did_wild_list = FALSE;
*** ../vim-8.2.4327/src/testdir/test_cmdline.vim 2022-02-08 12:07:41.835496899 +0000
--- src/testdir/test_cmdline.vim 2022-02-08 17:34:52.157500377 +0000
***************
*** 2132,2137 ****
--- 2132,2146 ----
call TermWait(buf)
call VerifyScreenDump(buf, 'Test_wildmenu_pum_29', {})

+ " Check "list" still works
+ call term_sendkeys(buf, "\<C-U>set wildmode=longest,list\<CR>")
+ call term_sendkeys(buf, ":cn\<Tab>")
+ call TermWait(buf)
+ call VerifyScreenDump(buf, 'Test_wildmenu_pum_30', {})
+ call term_sendkeys(buf, "s")
+ call TermWait(buf)
+ call VerifyScreenDump(buf, 'Test_wildmenu_pum_31', {})
+
call term_sendkeys(buf, "\<C-U>\<CR>")
call StopVimInTerminal(buf)
call delete('Xtest')
*** ../vim-8.2.4327/src/testdir/dumps/Test_wildmenu_pum_30.dump 2022-02-08 17:40:07.485055922 +0000
--- src/testdir/dumps/Test_wildmenu_pum_30.dump 2022-02-08 17:35:01.721486772 +0000
***************
*** 0 ****
--- 1,10 ----
+ |~+0#4040ff13#ffffff0| @73
+ |~| @73
+ |~| @73
+ |~| @73
+ |~| @73
+ |~| @73
+ |:+0#0000000&|c|n| @71
+ |c|n|e|w|e|r| @6|c|n|f|i|l|e| @6|c|n|o|r|e|m|a|p| @40
+ |c|n|e|x|t| @7|c|n|o|r|e|a|b@1|r|e|v| @1|c|n|o|r|e|m|e|n|u| @39
+ |:|c|n> @71
*** ../vim-8.2.4327/src/testdir/dumps/Test_wildmenu_pum_31.dump 2022-02-08 17:40:07.489055913 +0000
--- src/testdir/dumps/Test_wildmenu_pum_31.dump 2022-02-08 17:35:02.793485249 +0000
***************
*** 0 ****
--- 1,10 ----
+ |~+0#4040ff13#ffffff0| @73
+ |~| @73
+ |~| @73
+ |~| @73
+ |~| @73
+ |~| @73
+ |:+0#0000000&|c|n| @71
+ |c|n|e|w|e|r| @6|c|n|f|i|l|e| @6|c|n|o|r|e|m|a|p| @40
+ |c|n|e|x|t| @7|c|n|o|r|e|a|b@1|r|e|v| @1|c|n|o|r|e|m|e|n|u| @39
+ |:|c|n|s> @70
*** ../vim-8.2.4327/src/version.c 2022-02-08 15:05:16.664625568 +0000
--- src/version.c 2022-02-08 17:37:40.689261865 +0000
***************
*** 748,749 ****
--- 748,751 ----
{ /* Add new patch number below this line */
+ /**/
+ 4328,
/**/

--
I have a drinking problem -- I can't afford it.

/// Bram Moolenaar -- Br...@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 ///
Reply all
Reply to author
Forward
0 new messages