diff options
author | Bram Moolenaar <Bram@vim.org> | 2021-02-26 22:21:23 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2021-02-26 22:21:23 +0100 |
commit | 0abc6e471ae78167bd75f95603b9bdd27ff0b38f (patch) | |
tree | 51a9f0123a02bc17bff911527ba36d8a9e46aa2b | |
parent | 9f646c2e1105f27484d7b008a29da554ff2c21b6 (diff) | |
download | vim-git-0abc6e471ae78167bd75f95603b9bdd27ff0b38f.tar.gz |
patch 8.2.2553: Vim9: Cannot put "|" after "{"v8.2.2553
Problem: Vim9: Cannot put "|" after "{".
Solution: Add the EX_TRLBAR flag. (issue #7904)
-rw-r--r-- | src/ex_cmds.h | 2 | ||||
-rw-r--r-- | src/ex_eval.c | 2 | ||||
-rw-r--r-- | src/version.c | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/src/ex_cmds.h b/src/ex_cmds.h index d114fedb8..90fd01538 100644 --- a/src/ex_cmds.h +++ b/src/ex_cmds.h @@ -1820,7 +1820,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 - 0, + EX_TRLBAR, ADDR_NONE), EXCMD(CMD_endblock, "}", ex_endblock, EX_TRLBAR|EX_CMDWIN|EX_LOCK_OK, diff --git a/src/ex_eval.c b/src/ex_eval.c index ad9de26db..f6f766a30 100644 --- a/src/ex_eval.c +++ b/src/ex_eval.c @@ -912,7 +912,7 @@ ex_eval(exarg_T *eap) enter_block(cstack_T *cstack) { ++cstack->cs_idx; - if (in_vim9script()) + if (in_vim9script() && current_sctx.sc_sid > 0) { scriptitem_T *si = SCRIPT_ITEM(current_sctx.sc_sid); diff --git a/src/version.c b/src/version.c index dc6a16c0c..eece321b3 100644 --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2553, +/**/ 2552, /**/ 2551, |