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 #8689)

diff --git a/src/ex_cmds.h b/src/ex_cmds.h
index 8596b24b4b4995a377b7ba44b7f5aff0980fec86..480bf3c04422d8683a7df5f7d3549593ec23e641 100644 (file)
--- a/src/ex_cmds.h
+++ b/src/ex_cmds.h
@@ -1853,7 +1853,7 @@ EXCMD(CMD_at,             "@",            ex_at,
        EX_RANGE|EX_WHOLEFOLD|EX_EXTRA|EX_TRLBAR|EX_CMDWIN|EX_LOCK_OK|EX_NONWHITE_OK,
        ADDR_LINES),
 EXCMD(CMD_block,       "{",            ex_block,  // not found normally
-       EX_TRLBAR|EX_LOCK_OK,
+       EX_TRLBAR|EX_LOCK_OK|EX_CMDWIN,
        ADDR_NONE),
 EXCMD(CMD_endblock,    "}",            ex_endblock,
        EX_TRLBAR|EX_CMDWIN|EX_LOCK_OK,

diff --git a/src/testdir/test_vim9_cmd.vim b/src/testdir/test_vim9_cmd.vim
index e6554e9688b1599f2c4ec0013f4575882c33ed7c..a6241134a492fdd95fe8cacbba6b80911f26eab5 100644 (file)
--- a/src/testdir/test_vim9_cmd.vim
+++ b/src/testdir/test_vim9_cmd.vim
@@ -1262,7 +1262,7 @@ def Test_substitute_expr()
   # List results in multiple lines
   new
   setline(1, 'some text here')
-  s/text/\=['aaa', 'bbb', 'ccc']/ 
+  s/text/\=['aaa', 'bbb', 'ccc']/
   assert_equal(['some aaa', 'bbb', 'ccc', ' here'], getline(1, '$'))
   bwipe!
 enddef
@@ -1338,5 +1338,18 @@ def Test_echo_void()
   CheckScriptFailure(lines, 'E1186:', 1)
 enddef
 
+def Test_cmdwin_block()
+  augroup justTesting
+    autocmd BufEnter * {
+      echomsg 'in block'
+    }
+  augroup END
+  feedkeys('q:', 'xt')
+  redraw
+  feedkeys("aclose\<CR>", 'xt')
+
+  au! justTesting
+enddef
+
 
 " vim: ts=8 sw=2 sts=2 expandtab tw=80 fdm=marker

diff --git a/src/version.c b/src/version.c
index f2aae14a5e654714851f8838a14b0a16753e0c78..69df6714950db237b30b69a8febc76e2af833942 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    3279,
 /**/
     3278,
 /**/