patch 8.2.1496: Vim9: cannot use " #" in a mapping

Problem:    Vim9: cannot use " #" in a mapping.
Solution:   Do not remove a comment with the EX_NOTRLCOM flag. (closes #6746)

diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 233ac1041edc6d1465be363823f6fdbb2c99b0c3..854ff4dfb0a004a88d9c25579b7bbfc53374b48b 100644 (file)
--- 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 676e97ceb1a4a08deb2a361c747e8ba0faad9045..9f4231a9a351b6cd140f56fff1883286b42e1cf5 100644 (file)
--- 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 126d98005c61b2d08203f5cb5048c8b901c7b0ee..c2057b318d9040848b59d8e5a7dfda68d6aaeae5 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1496,
 /**/
     1495,
 /**/

diff --git a/src/vim9compile.c b/src/vim9compile.c
index 00572e316763e93cd36d05c277d72e255de519a9..025e8cbc6e563ff2237b48962bda31e626c707fb 100644 (file)
--- 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;