thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.2.4615: mapping with escaped bar does not work in :def function

Browse Source 
Problem:    Mapping with escaped bar does not work in :def function. (Sergey
            Vlasov)
Solution:   Do not remove the backslash. (closes #10002)
This commit is contained in:
Bram Moolenaar
2022-03-23 19:45:01 +00:00
parent c20e46a4e3
commit ac48506ac6
6 changed files with 27 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/ex_docmd.c
View File

@@ -2275,7 +2275,7 @@ do_one_cmd(
*/
if ((ea.argt & EX_TRLBAR) && !ea.usefilter)
{
separate_nextcmd(&ea);
separate_nextcmd(&ea, FALSE);
}
else if (ea.cmdidx == CMD_bang
|| ea.cmdidx == CMD_terminal
@@ -5081,9 +5081,10 @@ repl_cmdline(
/*
* Check for '|' to separate commands and '"' to start comments.
* If "keep_backslash" is TRUE do not remove any backslash.
*/
void
separate_nextcmd(exarg_T *eap)
separate_nextcmd(exarg_T *eap, int keep_backslash)
{
char_u *p;
@@ -5097,7 +5098,7 @@ separate_nextcmd(exarg_T *eap)
{
if (*p == Ctrl_V)
{
if (eap->argt & (EX_CTRLV | EX_XFILE))
if ((eap->argt & (EX_CTRLV | EX_XFILE)) || keep_backslash)
++p; // skip CTRL-V and next char
else
// remove CTRL-V and skip next char
@@ -5144,8 +5145,11 @@ separate_nextcmd(exarg_T *eap)
if ((vim_strchr(p_cpo, CPO_BAR) == NULL
|| !(eap->argt & EX_CTRLV)) && *(p - 1) == '\\')
{
STRMOVE(p - 1, p); // remove the '\'
--p;
if (!keep_backslash)
{
STRMOVE(p - 1, p); // remove the '\'
--p;
}
}
else
{