To: vim_dev@googlegroups.com Subject: Patch 8.2.2416 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.2416 Problem: May get stuck in command line window state. Solution: Reset "cmdwin_type" when editing buffer fails. Make arglist test pass on MS-Windows. Files: src/ex_getln.c, src/testdir/test_arglist.vim *** ../vim-8.2.2415/src/ex_getln.c 2021-01-26 22:00:47.882149627 +0100 --- src/ex_getln.c 2021-01-27 19:59:01.700087302 +0100 *************** *** 4214,4219 **** --- 4214,4220 ---- // Some autocommand messed it up? win_close(curwin, TRUE); ga_clear(&winsizes); + cmdwin_type = 0; return Ctrl_C; } *** ../vim-8.2.2415/src/testdir/test_arglist.vim 2021-01-26 22:42:17.694836803 +0100 --- src/testdir/test_arglist.vim 2021-01-27 20:32:08.863281870 +0100 *************** *** 563,574 **** " Test for ":all" not working when in the cmdline window func Test_all_not_allowed_from_cmdwin() CheckFeature cmdwin - " TODO: why does this hang on Windows? - CheckNotMSWindows au BufEnter * all next x ! call assert_fails(":norm 7q?print\", 'E11:') au! BufEnter endfunc --- 563,580 ---- " Test for ":all" not working when in the cmdline window func Test_all_not_allowed_from_cmdwin() CheckFeature cmdwin au BufEnter * all next x ! " Use try/catch here, somehow assert_fails() doesn't work on MS-Windows ! " console. ! let caught = 'no' ! try ! exe ":norm! 7q?apat\" ! catch /E11:/ ! let caught = 'yes' ! endtry ! call assert_equal('yes', caught) au! BufEnter endfunc *** ../vim-8.2.2415/src/version.c 2021-01-26 22:42:17.694836803 +0100 --- src/version.c 2021-01-27 20:32:48.327463714 +0100 *************** *** 752,753 **** --- 752,755 ---- { /* Add new patch number below this line */ + /**/ + 2416, /**/ -- hundred-and-one symptoms of being an internet addict: 248. You sign your letters with your e-mail address instead of your name. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///