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

patch 7.4.1405

Browse Source 
Problem:    Completion menu flickers.
Solution:   Delay showing the popup menu. (Shougo, Justin M. Keyes, closes
            #656)
This commit is contained in:
Bram Moolenaar 2016-02-23 20:13:16 +01:00
parent 9186a27622
commit 8aefbe0ad5
2 changed files with 36 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/edit.c
View File

@ -185,7 +185,8 @@ static int ins_compl_key2dir(int c);
static int ins_compl_pum_key(int c); static int ins_compl_pum_key(int c);
static int ins_compl_key2count(int c); static int ins_compl_key2count(int c);
static int ins_compl_use_match(int c); static int ins_compl_use_match(int c);
static int ins_complete(int c); static int ins_complete(int c, int enable_pum);
static void show_pum(int save_w_wrow);
static unsigned quote_meta(char_u *dest, char_u *str, int len); static unsigned quote_meta(char_u *dest, char_u *str, int len);
#endif /* FEAT_INS_EXPAND */ #endif /* FEAT_INS_EXPAND */
@ -1429,7 +1430,7 @@ doESCkey:
docomplete: docomplete:
compl_busy = TRUE; compl_busy = TRUE;
if (ins_complete(c) == FAIL) if (ins_complete(c, TRUE) == FAIL)
compl_cont_status = 0; compl_cont_status = 0;
compl_busy = FALSE; compl_busy = FALSE;
break; break;
@ -2765,6 +2766,8 @@ ins_compl_make_cyclic(void)
void void
set_completion(colnr_T startcol, list_T *list) set_completion(colnr_T startcol, list_T *list)
{ {
int save_w_wrow = curwin->w_wrow;
/* If already doing completions stop it. */ /* If already doing completions stop it. */
if (ctrl_x_mode != 0) if (ctrl_x_mode != 0)
ins_compl_prep(' '); ins_compl_prep(' ');
@ -2794,11 +2797,15 @@ set_completion(colnr_T startcol, list_T *list)
compl_curr_match = compl_first_match; compl_curr_match = compl_first_match;
if (compl_no_insert) if (compl_no_insert)
ins_complete(K_DOWN); ins_complete(K_DOWN, FALSE);
else else
ins_complete(Ctrl_N); ins_complete(Ctrl_N, FALSE);
if (compl_no_select) if (compl_no_select)
ins_complete(Ctrl_P); ins_complete(Ctrl_P, FALSE);
/* Lazily show the popup menu, unless we got interrupted. */
if (!compl_interrupted)
show_pum(save_w_wrow);
out_flush(); out_flush();
} }
@ -3484,7 +3491,7 @@ ins_compl_new_leader(void)
} }
#endif #endif
compl_restarting = TRUE; compl_restarting = TRUE;
if (ins_complete(Ctrl_N) == FAIL) if (ins_complete(Ctrl_N, TRUE) == FAIL)
compl_cont_status = 0; compl_cont_status = 0;
compl_restarting = FALSE; compl_restarting = FALSE;
} }
@ -5017,7 +5024,7 @@ ins_compl_use_match(int c)
* Returns OK if completion was done, FAIL if something failed (out of mem). * Returns OK if completion was done, FAIL if something failed (out of mem).
*/ */
static int static int
ins_complete(int c) ins_complete(int c, int enable_pum)
{ {
char_u *line; char_u *line;
int startcol = 0; /* column where searched text starts */ int startcol = 0; /* column where searched text starts */
@ -5610,10 +5617,22 @@ ins_complete(int c)
} }
/* Show the popup menu, unless we got interrupted. */ /* Show the popup menu, unless we got interrupted. */
if (!compl_interrupted) if (enable_pum && !compl_interrupted)
{
show_pum(save_w_wrow);
}
compl_was_interrupted = compl_interrupted;
compl_interrupted = FALSE;
return OK;
}
static void
show_pum(int save_w_wrow)
{ {
/* RedrawingDisabled may be set when invoked through complete(). */ /* RedrawingDisabled may be set when invoked through complete(). */
n = RedrawingDisabled; int n = RedrawingDisabled;
RedrawingDisabled = 0; RedrawingDisabled = 0;
/* If the cursor moved we need to remove the pum first. */ /* If the cursor moved we need to remove the pum first. */
@ -5625,11 +5644,6 @@ ins_complete(int c)
setcursor(); setcursor();
RedrawingDisabled = n; RedrawingDisabled = n;
} }
compl_was_interrupted = compl_interrupted;
compl_interrupted = FALSE;
return OK;
}
/* /*
* Looks in the first "len" chars. of "src" for search-metachars. * Looks in the first "len" chars. of "src" for search-metachars.

2
src/version.c
View File

@ -748,6 +748,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 */
/**/
1405,
/**/ /**/
1404, 1404,
/**/ /**/