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

updated for version 7.2-224

Browse Source
This commit is contained in:
Bram Moolenaar
2009-07-09 16:15:16 +00:00
parent 8e258a4a94
commit 031e0dd663
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/edit.c
View File

@@ -114,6 +114,10 @@ static int compl_restarting = FALSE; /* don't insert match */
* FALSE the word to be completed must be located. */ * FALSE the word to be completed must be located. */
static int compl_started = FALSE; static int compl_started = FALSE;
/* Set when doing something for completion that may call edit() recursively,
* which is not allowed. */
static int compl_busy = FALSE;
static int compl_matches = 0; static int compl_matches = 0;
static char_u *compl_pattern = NULL; static char_u *compl_pattern = NULL;
static int compl_direction = FORWARD; static int compl_direction = FORWARD;
@@ -346,7 +350,7 @@ edit(cmdchar, startln, count)
#ifdef FEAT_INS_EXPAND #ifdef FEAT_INS_EXPAND
/* Don't allow recursive insert mode when busy with completion. */ /* Don't allow recursive insert mode when busy with completion. */
if (compl_started || pum_visible()) if (compl_started || compl_busy || pum_visible())
{ {
EMSG(_(e_secure)); EMSG(_(e_secure));
return FALSE; return FALSE;
@@ -1340,8 +1344,10 @@ doESCkey:
goto normalchar; goto normalchar;
docomplete: docomplete:
compl_busy = TRUE;
if (ins_complete(c) == FAIL) if (ins_complete(c) == FAIL)
compl_cont_status = 0; compl_cont_status = 0;
compl_busy = FALSE;
break; break;
#endif /* FEAT_INS_EXPAND */ #endif /* FEAT_INS_EXPAND */
@@ -3172,6 +3178,7 @@ ins_compl_free()
vim_free(match); vim_free(match);
} while (compl_curr_match != NULL && compl_curr_match != compl_first_match); } while (compl_curr_match != NULL && compl_curr_match != compl_first_match);
compl_first_match = compl_curr_match = NULL; compl_first_match = compl_curr_match = NULL;
compl_shown_match = NULL;
} }
static void static void

2
src/version.c
View File

@@ -676,6 +676,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 */
/**/
224,
/**/ /**/
223, 223,
/**/ /**/