To: vim_dev@googlegroups.com Subject: Patch 8.2.5044 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.5044 (after 8.2.5043) Problem: Command line test fails. Solution: Also beep when cmdline win can't be opened because of locks. Make the test not beep. Make the test pass on MS-Windows. Files: src/ex_getln.c, src/testdir/test_substitute.vim *** ../vim-8.2.5043/src/ex_getln.c 2022-05-30 15:23:05.376780132 +0100 --- src/ex_getln.c 2022-05-30 15:42:10.008258946 +0100 *************** *** 4395,4405 **** #endif // Can't do this when text or buffer is locked. - if (text_or_buf_locked()) - return K_IGNORE; - // Can't do this recursively. Can't do it when typing a password. ! if (cmdwin_type != 0 # if defined(FEAT_CRYPT) || defined(FEAT_EVAL) || cmdline_star > 0 # endif --- 4395,4403 ---- #endif // Can't do this when text or buffer is locked. // Can't do this recursively. Can't do it when typing a password. ! if (text_or_buf_locked() ! || cmdwin_type != 0 # if defined(FEAT_CRYPT) || defined(FEAT_EVAL) || cmdline_star > 0 # endif *** ../vim-8.2.5043/src/testdir/test_substitute.vim 2022-05-30 15:23:05.380780131 +0100 --- src/testdir/test_substitute.vim 2022-05-30 16:00:02.211684933 +0100 *************** *** 1040,1045 **** --- 1040,1046 ---- " the error only happens in a very specific setup, run a new Vim instance to " get a clean starting point. let lines =<< trim [SCRIPT] + set vb t_vb= norm o0000000000000000000000000000000000000000000000000000 func Replace() norm q/ *************** *** 1052,1059 **** [SCRIPT] call writefile(lines, 'Xscript') if RunVim([], [], '-u NONE -S Xscript') ! let messages = readfile('Xresult') ! call assert_match('E565: Not allowed to change text or change window', messages[3]) endif call delete('Xscript') --- 1053,1060 ---- [SCRIPT] call writefile(lines, 'Xscript') if RunVim([], [], '-u NONE -S Xscript') ! call assert_match('E565: Not allowed to change text or change window', ! \ readfile('Xresult')->join('XX')) endif call delete('Xscript') *** ../vim-8.2.5043/src/version.c 2022-05-30 15:23:05.380780131 +0100 --- src/version.c 2022-05-30 15:43:10.752230260 +0100 *************** *** 736,737 **** --- 736,739 ---- { /* Add new patch number below this line */ + /**/ + 5044, /**/ -- Shit makes the flowers grow and that's beautiful /// Bram Moolenaar -- Bram@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 ///