diff options
| -rw-r--r-- | src/ex_docmd.c | 1 | ||||
| -rw-r--r-- | src/testdir/test_vim9_cmd.vim | 9 | ||||
| -rw-r--r-- | src/version.c | 2 | ||||
| -rw-r--r-- | src/vim9compile.c | 1 |
4 files changed, 13 insertions, 0 deletions
diff --git a/src/ex_docmd.c b/src/ex_docmd.c index 233ac1041..854ff4dfb 100644 --- a/src/ex_docmd.c +++ b/src/ex_docmd.c @@ -4604,6 +4604,7 @@ separate_nextcmd(exarg_T *eap) #ifdef FEAT_EVAL || (*p == '#' && in_vim9script() + && !(eap->argt & EX_NOTRLCOM) && p[1] != '{' && p > eap->cmd && VIM_ISWHITE(p[-1])) #endif diff --git a/src/testdir/test_vim9_cmd.vim b/src/testdir/test_vim9_cmd.vim index 676e97ceb..9f4231a9a 100644 --- a/src/testdir/test_vim9_cmd.vim +++ b/src/testdir/test_vim9_cmd.vim @@ -286,5 +286,14 @@ def Test_eval_command() unlet g:val enddef +def Test_map_command() + let lines =<< trim END + nnoremap <F3> :echo 'hit F3 #'<CR> + assert_equal(":echo 'hit F3 #'<CR>", maparg("<F3>", "n")) + END + CheckDefSuccess(lines) + CheckScriptSuccess(['vim9script'] + lines) +enddef + " vim: ts=8 sw=2 sts=2 expandtab tw=80 fdm=marker diff --git a/src/version.c b/src/version.c index 126d98005..c2057b318 100644 --- a/src/version.c +++ b/src/version.c @@ -755,6 +755,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1496, +/**/ 1495, /**/ 1494, diff --git a/src/vim9compile.c b/src/vim9compile.c index 00572e316..025e8cbc6 100644 --- a/src/vim9compile.c +++ b/src/vim9compile.c @@ -6251,6 +6251,7 @@ compile_exec(char_u *line, exarg_T *eap, cctx_T *cctx) usefilter = TRUE; if ((argt & EX_TRLBAR) && !usefilter) { + eap->argt = argt; separate_nextcmd(eap); if (eap->nextcmd != NULL) nextcmd = eap->nextcmd; |