0
0
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00

updated for version 7.0g01

This commit is contained in:
Bram Moolenaar
2006-05-02 22:08:30 +00:00
parent c9b4b05b35
commit d68071d8da
45 changed files with 668 additions and 230 deletions

View File

@@ -4695,9 +4695,9 @@ ins_complete(c)
compl_matches = n;
compl_curr_match = compl_shown_match;
compl_direction = compl_shows_dir;
compl_interrupted = FALSE;
/* eat the ESC to avoid leaving insert mode */
/* Eat the ESC that vgetc() returns after a CTRL-C to avoid leaving Insert
* mode. */
if (got_int && !global_busy)
{
(void)vgetc();
@@ -4831,12 +4831,17 @@ ins_complete(c)
else
msg_clr_cmdline(); /* necessary for "noshowmode" */
/* RedrawingDisabled may be set when invoked through complete(). */
n = RedrawingDisabled;
RedrawingDisabled = 0;
ins_compl_show_pum();
setcursor();
RedrawingDisabled = n;
/* Show the popup menu, unless we got interrupted. */
if (!compl_interrupted)
{
/* RedrawingDisabled may be set when invoked through complete(). */
n = RedrawingDisabled;
RedrawingDisabled = 0;
ins_compl_show_pum();
setcursor();
RedrawingDisabled = n;
}
compl_interrupted = FALSE;
return OK;
}