diff --git a/src/testdir/dumps/Test_search_wildmenu_6.dump b/src/testdir/dumps/Test_search_wildmenu_6.dump new file mode 100644 index 0000000000..21ef804d9d --- /dev/null +++ b/src/testdir/dumps/Test_search_wildmenu_6.dump @@ -0,0 +1,10 @@ +|t+0&#ffff4012|h|e+0&#ffffff0| @71 +|t+1&&|h|e+0&&|s|e| @69 +|t+0&#ffff4012|h|e+0&#ffffff0| @71 +|f|o@1|b|a|r| @68 +|t+0&#ffff4012|h|e+0&#ffffff0|t+0&#ffff4012|h|e+0&#ffffff0| @68 +|t+0&#ffff4012|h|e+0&#ffffff0|t+0&#ffff4012|h|e+0&#ffffff0|r|e| @66 +|~+0#4040ff13&| @73 +|~| @73 +|~| @73 +|/+0#0000000&|t|h> @71 diff --git a/src/testdir/dumps/Test_search_wildmenu_7.dump b/src/testdir/dumps/Test_search_wildmenu_7.dump new file mode 100644 index 0000000000..fbf8578724 --- /dev/null +++ b/src/testdir/dumps/Test_search_wildmenu_7.dump @@ -0,0 +1,10 @@ +|t+0&#ffff4012|h|e+0&#ffffff0| @71 +|t+1&&|h|e+0&&|s|e| @69 +|t+0&#ffff4012|h|e+0&#ffffff0| @71 +|f|o@1|b|a|r| @68 +|t+0&#ffff4012|h|e+0&#ffffff0|t+0&#ffff4012|h|e+0&#ffffff0| @68 +|t+0&#ffff4012|h|e+0&#ffffff0|t+0&#ffff4012|h|e+0&#ffffff0|r|e| @66 +|~+0#4040ff13&| @73 +|~| @73 +|t+0#0000001#ffff4012|h|e|s|e| +3#0000000#ffffff0@1|t|h|e| @1|t|h|e|t|h|e| @1|t|h|e|t|h|e|r|e| @1|t|h|e|r|e| @39 +|/+0&&|t|h|e|s|e> @68 diff --git a/src/testdir/dumps/Test_search_wildmenu_8.dump b/src/testdir/dumps/Test_search_wildmenu_8.dump new file mode 100644 index 0000000000..37b4e84e53 --- /dev/null +++ b/src/testdir/dumps/Test_search_wildmenu_8.dump @@ -0,0 +1,10 @@ +|t+0&#ffff4012|h|e| +0&#ffffff0@71 +|t+1&&|h|e|s+0&&|e| @69 +|t+0&#ffff4012|h|e| +0&#ffffff0@71 +|f|o@1|b|a|r| @68 +|t+0&#ffff4012|h|e|t|h|e| +0&#ffffff0@68 +|t+0&#ffff4012|h|e|t|h|e|r+0&#ffffff0|e| @66 +|~+0#4040ff13&| @73 +|~| @73 +|~| @73 +|/+0#0000000&|t|h|e> @70 diff --git a/src/testdir/test_cmdline.vim b/src/testdir/test_cmdline.vim index f9533fa029..cb0bcf720b 100644 --- a/src/testdir/test_cmdline.vim +++ b/src/testdir/test_cmdline.vim @@ -4534,6 +4534,16 @@ func Test_search_wildmenu_screendump() call term_sendkeys(buf, "\gg/t.*\\n.*\\n.\") call VerifyScreenDump(buf, 'Test_search_wildmenu_5', {}) + " 'incsearch' is redrawn after accepting completion + call term_sendkeys(buf, "\:set wim=full\") + call term_sendkeys(buf, ":set incsearch hlsearch\") + call term_sendkeys(buf, "/th") + call VerifyScreenDump(buf, 'Test_search_wildmenu_6', {}) + call term_sendkeys(buf, "\") + call VerifyScreenDump(buf, 'Test_search_wildmenu_7', {}) + call term_sendkeys(buf, "\\") + call VerifyScreenDump(buf, 'Test_search_wildmenu_8', {}) + call term_sendkeys(buf, "\") call StopVimInTerminal(buf) endfunc diff --git a/src/version.c b/src/version.c index f9e0bea343..6b9d934508 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 */ +/**/ + 1516, /**/ 1515, /**/