patch 8.2.2553: Vim9: Cannot put "|" after "{"

Problem:    Vim9: Cannot put "|" after "{".
Solution:   Add the EX_TRLBAR flag. (issue #7904)

diff --git a/src/ex_cmds.h b/src/ex_cmds.h
index d114fedb88724a2270440b0434fe4e00bd87102a..90fd015384c211e72a95bc5882ef1435e09d9d54 100644 (file)
--- 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 ad9de26dbe2f6a02e2cb6936e12470f05232fb56..f6f766a3002fe987b8e2ddbfceef01de3f15302a 100644 (file)
--- 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 dc6a16c0c1ebeaf3d663eae969d20fbfae1c6f76..eece321b3636ec79e5a64165c8fb85574d8d8d4e 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2553,
 /**/
     2552,
 /**/