patch 9.1.1682: tests: Test_wildtrigger_update_screen() creates unused mapping

Problem:  tests: Test_wildtrigger_update_screen() creates an unused
          mapping (after 9.1.1621).
Solution: Remove the mapping. Also use blank lines more consistently in
          test_cmdline.vim screendump tests (zeertzjq).

closes: #18096

Signed-off-by: zeertzjq <zeertzjq@outlook.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/src/testdir/test_cmdline.vim b/src/testdir/test_cmdline.vim
index 3f8cb2d8fb2c55ae6dfe7229903e2e08cc942090..01198e4bc11779b76e996fafa43070f49936713d 100644 (file)
--- a/src/testdir/test_cmdline.vim
+++ b/src/testdir/test_cmdline.vim
@@ -4827,6 +4827,7 @@ endfunc
 
 func Test_wildtrigger_update_screen()
   CheckScreendump
+
   let lines =<< trim [SCRIPT]
     command! -nargs=* -complete=customlist,TestFn TestCmd echo
     func TestFn(cmdarg, b, c)
@@ -4859,7 +4860,6 @@ func Test_wildtrigger_update_screen()
 
   call term_sendkeys(buf, "\<esc>")
   call StopVimInTerminal(buf)
-  cnoremap <buffer> <F8> <C-R>=wildtrigger()[-1]<CR>
 endfunc
 
 " Issue #17969: With 'noselect', the popup menu should appear next to the
@@ -4867,6 +4867,7 @@ endfunc
 " file paths when 'noselect' is present.
 func Test_noselect_expand_env_var()
   CheckScreendump
+
   let lines =<< trim [SCRIPT]
     set wildmenu wildoptions=pum wildmode=noselect,full
     let $TESTDIR = 'a/b'
@@ -4886,6 +4887,7 @@ func Test_noselect_expand_env_var()
 
   call term_sendkeys(buf, "\<C-P>")
   call VerifyScreenDump(buf, 'Test_expand_env_var_1', {})
+
   " clean up
   call term_sendkeys(buf, "\<Esc>")
   call StopVimInTerminal(buf)
@@ -4895,6 +4897,7 @@ endfunc
 " 'wildmode' contains 'noselect'
 func Test_long_line_noselect()
   CheckScreendump
+
   let lines =<< trim [SCRIPT]
     set wildmenu wildoptions=pum wildmode=noselect,full
     command -nargs=1 -complete=custom,Entries DoubleEntry echo
@@ -4913,6 +4916,7 @@ func Test_long_line_noselect()
 
   call term_sendkeys(buf, "\<Esc>:DoubleEntry \<Tab>\<C-N>\<C-N>")
   call VerifyScreenDump(buf, 'Test_long_line_noselect_3', {})
+
   " clean up
   call term_sendkeys(buf, "\<Esc>")
   call StopVimInTerminal(buf)

diff --git a/src/version.c b/src/version.c
index 02c826e87ceb1b842734b39f847111cf2da34bdd..5ac3db391283a07cbbafad378391defa4a5fecb1 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -724,6 +724,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1682,
 /**/
     1681,
 /**/