aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

updated for version 7.1-241

Browse Source
This commit is contained in:
Bram Moolenaar 2008-01-22 16:50:03 +00:00
parent b44df0af83
commit d4e20a7813
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/edit.c
View File

@ -703,10 +703,13 @@ edit(cmdchar, startln, count)
#endif #endif
/* /*
* Get a character for Insert mode. * Get a character for Insert mode. Ignore K_IGNORE.
*/ */
lastc = c; /* remember previous char for CTRL-D */ lastc = c; /* remember previous char for CTRL-D */
c = safe_vgetc(); do
{
c = safe_vgetc();
} while (c == K_IGNORE);
#ifdef FEAT_AUTOCMD #ifdef FEAT_AUTOCMD
/* Don't want K_CURSORHOLD for the second key, e.g., after CTRL-V. */ /* Don't want K_CURSORHOLD for the second key, e.g., after CTRL-V. */
@ -777,7 +780,7 @@ edit(cmdchar, startln, count)
/* Prepare for or stop CTRL-X mode. This doesn't do completion, but /* Prepare for or stop CTRL-X mode. This doesn't do completion, but
* it does fix up the text when finishing completion. */ * it does fix up the text when finishing completion. */
compl_get_longest = FALSE; compl_get_longest = FALSE;
if (c != K_IGNORE && ins_compl_prep(c)) if (ins_compl_prep(c))
continue; continue;
#endif #endif
@ -4516,15 +4519,17 @@ ins_compl_check_keys(frequency)
else else
{ {
/* Need to get the character to have KeyTyped set. We'll put it /* Need to get the character to have KeyTyped set. We'll put it
* back with vungetc() below. */ * back with vungetc() below. But skip K_IGNORE. */
c = safe_vgetc(); c = safe_vgetc();
if (c != K_IGNORE)
{
/* Don't interrupt completion when the character wasn't typed,
* e.g., when doing @q to replay keys. */
if (c != Ctrl_R && KeyTyped)
compl_interrupted = TRUE;
/* Don't interrupt completion when the character wasn't typed, vungetc(c);
* e.g., when doing @q to replay keys. */ }
if (c != Ctrl_R && KeyTyped)
compl_interrupted = TRUE;
vungetc(c);
} }
} }
if (compl_pending != 0 && !got_int) if (compl_pending != 0 && !got_int)

2
src/version.c
View File

@ -666,6 +666,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 */
/**/
241,
/**/ /**/
240, 240,
/**/ /**/