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

patch 8.2.3993: when recording a change in Select mode char appears twice

Browse Source 
Problem:    When recording a change in Select mode the first typed character
            appears twice.
Solution:   When putting the character back into typeahead remove it from
            recorded characters. (closes #9462)
This commit is contained in:
Bram Moolenaar
2022-01-03 13:47:50 +00:00
parent 0e2508d9e6
commit c88e977862
5 changed files with 69 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
src/getchar.c
View File

@@ -241,6 +241,22 @@ add_buff(
}
}
/*
* Delete "slen" bytes from the end of "buf".
* Only works when it was just added.
*/
static void
delete_buff_tail(buffheader_T *buf, int slen)
{
int len = (int)STRLEN(buf->bh_curr->b_str);
if (len >= slen)
{
buf->bh_curr->b_str[len - slen] = NUL;
buf->bh_space += slen;
}
}
/*
* Add number "n" to buffer "buf".
*/
@@ -1100,12 +1116,13 @@ ins_typebuf(
* Can be used for a character obtained by vgetc() that needs to be put back.
* Uses cmd_silent, KeyTyped and KeyNoremap to restore the flags belonging to
* the char.
* Returns the length of what was inserted.
*/
void
int
ins_char_typebuf(int c, int modifier)
{
char_u buf[MB_MAXBYTES + 4];
int idx = 0;
int len = 0;
if (modifier != 0)
{
@@ -1113,19 +1130,23 @@ ins_char_typebuf(int c, int modifier)
buf[1] = KS_MODIFIER;
buf[2] = modifier;
buf[3] = NUL;
idx = 3;
len = 3;
}
if (IS_SPECIAL(c))
{
buf[idx] = K_SPECIAL;
buf[idx + 1] = K_SECOND(c);
buf[idx + 2] = K_THIRD(c);
buf[idx + 3] = NUL;
idx += 3;
buf[len] = K_SPECIAL;
buf[len + 1] = K_SECOND(c);
buf[len + 2] = K_THIRD(c);
buf[len + 3] = NUL;
len += 3;
}
else
buf[(*mb_char2bytes)(c, buf + idx) + idx] = NUL;
{
len += (*mb_char2bytes)(c, buf + len);
buf[len] = NUL;
}
(void)ins_typebuf(buf, KeyNoremap, 0, !KeyTyped, cmd_silent);
return len;
}
/*
@@ -1301,6 +1322,22 @@ gotchars(char_u *chars, int len)
++maptick;
}
/*
* Undo the last gotchars() for "len" bytes. To be used when putting a typed
* character back into the typeahead buffer, thus gotchars() will be called
* again.
* Only affects recorded characters.
*/
void
ungetchars(int len)
{
if (reg_recording != 0)
{
delete_buff_tail(&recordbuff, len);
last_recorded_len -= len;
}
}
/*
* Sync undo. Called when typed characters are obtained from the typeahead
* buffer, or when a menu is used.