aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00
Code Activity

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

Browse Source 
Problem:    Vim9: cannot use " #" in a mapping.
Solution:   Do not remove a comment with the EX_NOTRLCOM flag. (closes #6746)
This commit is contained in:
Bram Moolenaar
2020-08-20 18:02:47 +02:00
parent df2524bbb4
commit b8a9296ced
4 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/ex_docmd.c
View File

@@ -4604,6 +4604,7 @@ separate_nextcmd(exarg_T *eap)
#ifdef FEAT_EVAL #ifdef FEAT_EVAL
|| (*p == '#' || (*p == '#'
&& in_vim9script() && in_vim9script()
&& !(eap->argt & EX_NOTRLCOM)
&& p[1] != '{' && p[1] != '{'
&& p > eap->cmd && VIM_ISWHITE(p[-1])) && p > eap->cmd && VIM_ISWHITE(p[-1]))
#endif #endif

9
src/testdir/test_vim9_cmd.vim
View File

@@ -286,5 +286,14 @@ def Test_eval_command()
unlet g:val unlet g:val
enddef 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 " vim: ts=8 sw=2 sts=2 expandtab tw=80 fdm=marker

2
src/version.c
View File

@@ -754,6 +754,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1496,
/**/ /**/
1495, 1495,
/**/ /**/

1
src/vim9compile.c
View File

@@ -6251,6 +6251,7 @@ compile_exec(char_u *line, exarg_T *eap, cctx_T *cctx)
usefilter = TRUE; usefilter = TRUE;
if ((argt & EX_TRLBAR) && !usefilter) if ((argt & EX_TRLBAR) && !usefilter)
{ {
eap->argt = argt;
separate_nextcmd(eap); separate_nextcmd(eap);
if (eap->nextcmd != NULL) if (eap->nextcmd != NULL)
nextcmd = eap->nextcmd; nextcmd = eap->nextcmd;