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

updated for version 7.3.260

Browse Source 
Problem:    CursorHold triggers on an incomplete mapping. (Will Gray)
Solution:   Don't trigger CursorHold when there is typeahead.
This commit is contained in:
Bram Moolenaar
2011-07-20 18:29:39 +02:00
parent 522f9aebff
commit 0533443638
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/fileio.c
View File

@@ -9044,7 +9044,10 @@ trigger_cursorhold()
{ {
int state; int state;
if (!did_cursorhold && has_cursorhold() && !Recording if (!did_cursorhold
&& has_cursorhold()
&& !Recording
&& typebuf.tb_len == 0
#ifdef FEAT_INS_EXPAND #ifdef FEAT_INS_EXPAND
&& !ins_compl_active() && !ins_compl_active()
#endif #endif
@@ -9935,6 +9938,8 @@ match_file_pat(pattern, prog, fname, sfname, tail, allow_dirs)
if ((c == ';' || c == '>') && match == FALSE) if ((c == ';' || c == '>') && match == FALSE)
{ {
*pattern = NUL; /* Terminate the string */ *pattern = NUL; /* Terminate the string */
/* TODO: match with 'filetype' of buffer that "fname" comes
* from. */
match = mch_check_filetype(fname, type_start); match = mch_check_filetype(fname, type_start);
*pattern = c; /* Restore the terminator */ *pattern = c; /* Restore the terminator */
type_start = pattern + 1; type_start = pattern + 1;

2
src/version.c
View File

@@ -709,6 +709,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 */
/**/
260,
/**/ /**/
259, 259,
/**/ /**/