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

updated for version 7.2.346

Browse Source 
Problem:    Repeating a command with @: causes a mapping to be applied twice.
Solution:   Do not remap characters inserted in the typeahead buffer. (Kana
            Natsuno)
This commit is contained in:
Bram Moolenaar
2010-01-27 16:31:13 +01:00
parent 5075aad6a8
commit 38ef43b262
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/ops.c
View File

@@ -1301,10 +1301,16 @@ put_reedit_in_typebuf(silent)
} }
} }
/*
* Insert register contents "s" into the typeahead buffer, so that it will be
* executed again.
* When "esc" is TRUE it is to be taken literally: Escape CSI characters and
* no remapping.
*/
static int static int
put_in_typebuf(s, esc, colon, silent) put_in_typebuf(s, esc, colon, silent)
char_u *s; char_u *s;
int esc; /* Escape CSI characters */ int esc;
int colon; /* add ':' before the line */ int colon; /* add ':' before the line */
int silent; int silent;
{ {
@@ -1312,7 +1318,7 @@ put_in_typebuf(s, esc, colon, silent)
put_reedit_in_typebuf(silent); put_reedit_in_typebuf(silent);
if (colon) if (colon)
retval = ins_typebuf((char_u *)"\n", REMAP_YES, 0, TRUE, silent); retval = ins_typebuf((char_u *)"\n", REMAP_NONE, 0, TRUE, silent);
if (retval == OK) if (retval == OK)
{ {
char_u *p; char_u *p;
@@ -1324,12 +1330,13 @@ put_in_typebuf(s, esc, colon, silent)
if (p == NULL) if (p == NULL)
retval = FAIL; retval = FAIL;
else else
retval = ins_typebuf(p, REMAP_YES, 0, TRUE, silent); retval = ins_typebuf(p, esc ? REMAP_NONE : REMAP_YES,
0, TRUE, silent);
if (esc) if (esc)
vim_free(p); vim_free(p);
} }
if (colon && retval == OK) if (colon && retval == OK)
retval = ins_typebuf((char_u *)":", REMAP_YES, 0, TRUE, silent); retval = ins_typebuf((char_u *)":", REMAP_NONE, 0, TRUE, silent);
return retval; return retval;
} }

2
src/version.c
View File

@@ -681,6 +681,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 */
/**/
346,
/**/ /**/
345, 345,
/**/ /**/