summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2021-08-02 22:26:56 +0200
committerBram Moolenaar <Bram@vim.org>2021-08-02 22:26:56 +0200
commit2c70711e3fb2ef24a7f55322fdadbf7f9e657c2f (patch)
tree296e5fdfaca0c7ee368ef24b6857550114b78633
parent7bf9a07bd7d6264f623109c2896b2a4002c86080 (diff)
patch 8.2.3279: Vim9: cannot use block in cmdline windowv8.2.3279
Problem: Vim9: cannot use block in cmdline window. Solution: Add EX_CMDWIN to the CMD_block flags. (closes #8689)
-rw-r--r--src/ex_cmds.h2
-rw-r--r--src/testdir/test_vim9_cmd.vim15
-rw-r--r--src/version.c2
3 files changed, 17 insertions, 2 deletions
diff --git a/src/ex_cmds.h b/src/ex_cmds.h
index 8596b24b4b..480bf3c044 100644
--- 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 e6554e9688..a6241134a4 100644
--- 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 f2aae14a5e..69df671495 100644
--- a/src/version.c
+++ b/src/version.c
@@ -756,6 +756,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 3279,
+/**/
3278,
/**/
3277,