Mercurial > vim

changeset 24022:29b15fbc2bcb v8.2.2553

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.2553: Vim9: Cannot put "|" after "{" Commit: https://github.com/vim/vim/commit/0abc6e471ae78167bd75f95603b9bdd27ff0b38f Author: Bram Moolenaar <Bram@vim.org> Date: Fri Feb 26 22:21:23 2021 +0100 patch 8.2.2553: Vim9: Cannot put "|" after "{" Problem: Vim9: Cannot put "|" after "{". Solution: Add the EX_TRLBAR flag. (issue https://github.com/vim/vim/issues/7904)
author Bram Moolenaar <Bram@vim.org>
date Fri, 26 Feb 2021 22:30:04 +0100
parents b4912d88999c
children 9b4821b59aa8
files src/ex_cmds.h src/ex_eval.c src/version.c
diffstat 3 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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,
--- 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);
 
--- 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,