patch 9.1.1596: tests: Test_search_wildmenu_iminsert() depends on help file
Commit: https://github.com/vim/vim/commit/615ad4ced1825d2c6099b4bc36312c02b6c01c8a Author: zeertzjq <zeert...@outlook.com> Date: Thu Aug 7 14:57:22 2025 +0200 patch 9.1.1596: tests: Test_search_wildmenu_iminsert() depends on help file Problem: tests: Test_search_wildmenu_iminsert() depends on help file (after 9.1.1594). Solution: Set buffer text using setline() instead of loading help file. Add a test for another bug fixed by 9.1.1594 (zeertzjq). related: #17870 closes: #17922 Signed-off-by: zeertzjq <zeert...@outlook.com> Signed-off-by: Christian Brabandt <c...@256bit.org> diff --git a/src/testdir/dumps/Test_search_wildmenu_iminsert.dump b/src/testdir/dumps/Test_search_wildmenu_iminsert.dump index a7dfb4506..3c4f976df 100644 --- a/src/testdir/dumps/Test_search_wildmenu_iminsert.dump +++ b/src/testdir/dumps/Test_search_wildmenu_iminsert.dump @@ -1,20 +1,12 @@ -| +0#0000001#e0e0e08|g|l|o|b|a|l| @8| +0#0000000#0000001|e+0&#ffffff0|s@1|:| |c|y|c|l|e| |f|u|l@1| |m|a|t|c|h|e|s| @34 -| +0#0000001#ffd7ff255|g|l|e| @11| +0#0000000#0000001|s+0#0000e05#ffffff0|e|t| |w|i|l|d|m|o|d|e|=|n|o|s|e|l|e|c|t|:|l|a|s|t|u|s|e|d|,|f|u|l@1| +0#0000000&@22 -| +0#0000001#ffd7ff255|g|l|o|b|a|l|-|l|o|c|a|l| @2| +0#0000000#0000001|b+0&#ffffff0|o|v|e|,| |b|u|t| |b|u|f@1|e|r| |m|a|t|c|h|e|s| |a|r|e| |s|o|r|t|e|d| |b|y| |t|i|m|e| |l|a|s|t| |u|s|e|d| @4 -| +0#0000001#ffd7ff255|g|l|o|b|a|l|/|l|o|c|a|l| @2| +0#0000000#0000001| +0&#ffffff0|h|e|r|e|:| |c+0#00e0e07&|m|d|l|i|n|e|-|c|o|m|p|l|e|t|i|o|n|.+0#0000000&| @31 -| +0#0000001#ffd7ff255|g|l|y|p|h|s| @8| +0#0000000#0000001| +0&#ffffff0@57 -| +0#0000001#ffd7ff255|g|l|e|s| @10| +0#0000000#0000001| +0&#ffffff0@30|'+0#e000002&|w|i|l|d|o|p|t|i|o|n|s|'| +0#0000000&|'+0#e000002&|w|o|p|'| +0#0000000&@7 -| +0#0000001#ffd7ff255|g|l|i|s|h| @9| +0#0000000#0000001|p+0#00e0003#ffffff0|'| +0#0000000&@4|s|t|r|i|n|g| @1|(|d|e|f|a|u|l|t| |"@1|)| @30 -| +0#0000001#ffd7ff255|g|l|y|.| @10| +0#0000000#0000001| +0&#ffffff0@6|g|l|o|b|a|l| @44 -| +0#0000001#ffd7ff255|g|l|e|d| @10| +0#0000000#0000001| +0&#ffffff0|w|o|r|d|s| |t|h|a|t| |c|h|a|n|g|e| |h|o|w| |c+0#00e0e07&|m|d|l|i|n|e|-|c|o|m|p|l|e|t|i|o|n| +0#0000000&|i|s| |d|o|n|e|.| @7 -| +0#0000001#ffd7ff255|g|l|y| @11| +0#0000000#0000001| +0&#ffffff0@57 -| +0#0000001#ffd7ff255|g|l|e|-|b|y|t|e| @6| +0#0000000#0000001|w+0&#ffffff0|i|n|g| |v|a|l|u|e|s| |a|r|e| |s|u|p@1|o|r|t|e|d|:| @31 -| +0#0000001#ffd7ff255|g|l|o|b|(|)| @8| +0#0000000#0000001|x+0&#ffffff0|t| @4|W|h|e|n| |t|h|i|s| |f|l|a|g| |i|s| |p|r|e|s|e|n|t|,| |s|e|a|r|c|h| |p|a|t@1|e|r|n| |c|o|m|p|l|e|t|i|o -| +0#0000001#ffd7ff255|g|l|o|b|(|p|a|t|,| @5| +0#0000000#a8a8a8255| +0&#ffffff0@57 -| +0#0000001#ffd7ff255|g|l|i|s|h|,| @8| +0#0000000#a8a8a8255| +0&#ffffff0@6|(|e|.|g|.|,| |i|n| |/+0#00e0e07&|,+0#0000000&| |?+0#00e0e07&|,+0#0000000&| |:+0#00e0e07&|s|,+0#0000000&| |:+0#00e0e07&|g|,+0#0000000&| |:+0#00e0e07&|v|,+0#0000000&| |a|n|d| |:+0#00e0e07&|v|i|m|)+0#0000000&| @13 -| +0#0000001#ffd7ff255|g|l|i|'| @10| +0#0000000#a8a8a8255| +0&#ffffff0@6|s|h|o|w|s| |e|x|a|c|t| |b|u|f@1|e|r| |t|e|x|t| |a|s| |m|e|n|u| |i|t|e|m|s|,| |w|i|t|h|o|u|t| @4 -| +0#0000001#ffd7ff255|g|l|o|b|a|l|-|i|m|e| @4| +0#0000000#a8a8a8255| +0&#ffffff0@6|p|r|e|s|e|r|v|i|n|g| |r|e|g|e|x| |a|r|t|i|f|a|c|t|s| |l|i|k|e| |p|o|s|i|t|i|o|n| @10 -| +0#0000001#ffd7ff255|g|l|e|-|r|e|p|e|a|t| @4| +0#0000000#a8a8a8255|]+3&#ffffff0|[|R|O|]| @27|<|l|a|n|g|>| |9@1|7|2|,|7|-|4|9| @5|9|7|% -| +0#0000001#ffd7ff255|g|l|e|'| @10| +0#0000000#a8a8a8255| +0&#ffffff0@57 -| +0#0000001#ffd7ff255|g|l|e|'|.| @9| +0#0000000#a8a8a8255| +1&#ffffff0@32|<|l|a|n|g|>| |0|,|0|-|1| @9|A|l@1 -|/+0&&|g|l|o|b|a|l> @67 +| +0#0000001#e0e0e08|g|l|o|b|a|l| @8|o+0#0000000#ffffff0|b|a|l|-|l|o|c|a|l| |g|l|o|b|a|l|/|l|o|c|a|l| |g|l|y|p|h|s| |t|o|g@1|l|e|s| |E|n|g|l|i|s|h| @12 +| +0#0000001#ffd7ff255|g|l|e| @11|g+0#0000000#ffffff0|l|e|d| |a|c@1|o|r|d|i|n|g|l|y| |s|i|n|g|l|e|-|b|y|t|e| @30 +| +0#0000001#ffd7ff255|g|l|o|b|a|l|-|l|o|c|a|l| @2| +0#4040ff13#ffffff0@58 +| +0#0000001#ffd7ff255|g|l|o|b|a|l|/|l|o|c|a|l| @2| +0#4040ff13#ffffff0@58 +| +0#0000001#ffd7ff255|g|l|y|p|h|s| @8| +0#4040ff13#ffffff0@58 +| +0#0000001#ffd7ff255|g|l|e|s| @10| +0#4040ff13#ffffff0@58 +| +0#0000001#ffd7ff255|g|l|i|s|h| @9| +0#4040ff13#ffffff0@58 +| +0#0000001#ffd7ff255|g|l|y|.| @10| +0#4040ff13#ffffff0@58 +| +0#0000001#ffd7ff255|g|l|e|d| @10| +0#4040ff13#ffffff0@58 +| +0#0000001#ffd7ff255|g|l|y| @11| +0#4040ff13#ffffff0@58 +| +0#0000001#ffd7ff255|g|l|e|-|b|y|t|e| @6| +0#4040ff13#ffffff0@58 +|/+0#0000000&|g|l|o|b|a|l> @67 diff --git a/src/testdir/test_cmdline.vim b/src/testdir/test_cmdline.vim index 0fe488499..95940d57b 100644 --- a/src/testdir/test_cmdline.vim +++ b/src/testdir/test_cmdline.vim @@ -3053,6 +3053,14 @@ func Test_wildmenu_pum_rightleft() call term_sendkeys(buf, ":sign \<Tab>") call VerifyScreenDump(buf, 'Test_wildmenu_pum_rl', {}) + " Behavior is the same when using 'keymap'. + call term_sendkeys(buf, "\<Esc>:set keymap=dvorak\<CR>") + call TermWait(buf) + " ";gul" -> "sign" when using Dvorak keymap. + call term_sendkeys(buf, ":\<C-^>;gul \<Tab>") + call VerifyScreenDump(buf, 'Test_wildmenu_pum_rl', {}) + call term_sendkeys(buf, "\<Esc>:set keymap&\<CR>") + call StopVimInTerminal(buf) endfunc @@ -4633,10 +4641,15 @@ func Test_search_wildmenu_iminsert() let lines =<< trim [SCRIPT] set wop=pum imi=1 - h wildoptions + setlocal iskeyword=!-~,192-255 + call setline(1, [ + \ "global toggle global-local global/local glyphs toggles English", + \ "accordingly. toggled accordingly single-byte", + \ ]) + call cursor(2, 42) [SCRIPT] call writefile(lines, 'XTest_search_wildmenu', 'D') - let buf = RunVimInTerminal('-S XTest_search_wildmenu', {'rows': 20}) + let buf = RunVimInTerminal('-S XTest_search_wildmenu', {'rows': 12}) call term_sendkeys(buf, "/gl\<Tab>") call TermWait(buf, 50) diff --git a/src/version.c b/src/version.c index 275d28ce4..7769481ff 100644 --- a/src/version.c +++ b/src/version.c @@ -719,6 +719,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1596, /**/ 1595, /**/ -- -- You received this message from the "vim_dev" maillist. Do not top-post! Type your reply below the text you are replying to. For more information, visit http://www.vim.org/maillist.php --- You received this message because you are subscribed to the Google Groups "vim_dev" group. To unsubscribe from this group and stop receiving emails from it, send an email to vim_dev+unsubscr...@googlegroups.com. To view this discussion visit https://groups.google.com/d/msgid/vim_dev/E1uk0SW-000T8d-87%40256bit.org.
