diff --git a/src/ex_docmd.c b/src/ex_docmd.c index 065a038232..c80d23e10f 100644 --- a/src/ex_docmd.c +++ b/src/ex_docmd.c @@ -1683,7 +1683,7 @@ comment_start(char_u *p, int starts_with_colon UNUSED) { #ifdef FEAT_EVAL if (in_vim9script()) - return p[0] == '#' && p[1] != '{' && !starts_with_colon; + return p[0] == '#' && !starts_with_colon; #endif return *p == '"'; } @@ -4780,7 +4780,6 @@ separate_nextcmd(exarg_T *eap) || (*p == '#' && in_vim9script() && !(eap->argt & EX_NOTRLCOM) - && p[1] != '{' && p > eap->cmd && VIM_ISWHITE(p[-1])) #endif || *p == '|' || *p == '\n') diff --git a/src/testdir/test_vim9_script.vim b/src/testdir/test_vim9_script.vim index bb070cacdc..45103fcac0 100644 --- a/src/testdir/test_vim9_script.vim +++ b/src/testdir/test_vim9_script.vim @@ -2069,7 +2069,21 @@ def Test_vim9_comment() CheckScriptSuccess([ 'vim9script', '# something', + '#something', + '#{something', ]) + + split Xfile + CheckScriptSuccess([ + 'vim9script', + 'edit #something', + ]) + CheckScriptSuccess([ + 'vim9script', + 'edit #{something', + ]) + close + CheckScriptFailure([ 'vim9script', ':# something', diff --git a/src/version.c b/src/version.c index f4211effaf..7f78742acd 100644 --- 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 */ +/**/ + 2135, /**/ 2134, /**/