• R/O
  • SSH

vim: Commit

Mirror of the Vim source from https://github.com/vim/vim


Commit MetaInfo

Revision7d24fdd18672be4599449f91afe7cb134f66fe44 (tree)
Time2021-08-03 05:30:04
AuthorBram Moolenaar <Bram@vim....>
CommiterBram Moolenaar

Log Message

patch 8.2.3279: Vim9: cannot use block in cmdline window

Commit: https://github.com/vim/vim/commit/2c70711e3fb2ef24a7f55322fdadbf7f9e657c2f
Author: Bram Moolenaar <Bram@vim.org>
Date: Mon Aug 2 22:26:56 2021 +0200

patch 8.2.3279: Vim9: cannot use block in cmdline window
Problem: Vim9: cannot use block in cmdline window.
Solution: Add EX_CMDWIN to the CMD_block flags. (closes https://github.com/vim/vim/issues/8689)

Change Summary

Incremental Difference

diff -r 5242c4ad09dd -r 7d24fdd18672 src/ex_cmds.h
--- a/src/ex_cmds.h Mon Aug 02 22:00:06 2021 +0200
+++ b/src/ex_cmds.h Mon Aug 02 22:30:04 2021 +0200
@@ -1853,7 +1853,7 @@
18531853 EX_RANGE|EX_WHOLEFOLD|EX_EXTRA|EX_TRLBAR|EX_CMDWIN|EX_LOCK_OK|EX_NONWHITE_OK,
18541854 ADDR_LINES),
18551855 EXCMD(CMD_block, "{", ex_block, // not found normally
1856- EX_TRLBAR|EX_LOCK_OK,
1856+ EX_TRLBAR|EX_LOCK_OK|EX_CMDWIN,
18571857 ADDR_NONE),
18581858 EXCMD(CMD_endblock, "}", ex_endblock,
18591859 EX_TRLBAR|EX_CMDWIN|EX_LOCK_OK,
diff -r 5242c4ad09dd -r 7d24fdd18672 src/testdir/test_vim9_cmd.vim
--- a/src/testdir/test_vim9_cmd.vim Mon Aug 02 22:00:06 2021 +0200
+++ b/src/testdir/test_vim9_cmd.vim Mon Aug 02 22:30:04 2021 +0200
@@ -1262,7 +1262,7 @@
12621262 # List results in multiple lines
12631263 new
12641264 setline(1, 'some text here')
1265- s/text/\=['aaa', 'bbb', 'ccc']/
1265+ s/text/\=['aaa', 'bbb', 'ccc']/
12661266 assert_equal(['some aaa', 'bbb', 'ccc', ' here'], getline(1, '$'))
12671267 bwipe!
12681268 enddef
@@ -1338,5 +1338,18 @@
13381338 CheckScriptFailure(lines, 'E1186:', 1)
13391339 enddef
13401340
1341+def Test_cmdwin_block()
1342+ augroup justTesting
1343+ autocmd BufEnter * {
1344+ echomsg 'in block'
1345+ }
1346+ augroup END
1347+ feedkeys('q:', 'xt')
1348+ redraw
1349+ feedkeys("aclose\<CR>", 'xt')
1350+
1351+ au! justTesting
1352+enddef
1353+
13411354
13421355 " vim: ts=8 sw=2 sts=2 expandtab tw=80 fdm=marker
diff -r 5242c4ad09dd -r 7d24fdd18672 src/version.c
--- a/src/version.c Mon Aug 02 22:00:06 2021 +0200
+++ b/src/version.c Mon Aug 02 22:30:04 2021 +0200
@@ -756,6 +756,8 @@
756756 static int included_patches[] =
757757 { /* Add new patch number below this line */
758758 /**/
759+ 3279,
760+/**/
759761 3278,
760762 /**/
761763 3277,
Show on old repository browser