diff options
| author | Bram Moolenaar <Bram@vim.org> | 2011-07-20 18:29:39 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2011-07-20 18:29:39 +0200 |
| commit | 053344363899f7d5ad6b8ae38abce4c81336e2e9 (patch) | |
| tree | 44893582f3d83a91d00b5b40e050f8ad0930860d | |
| parent | 522f9aebff72b4a2f079ef4e4231e24244ad6b19 (diff) | |
| download | vim-git-053344363899f7d5ad6b8ae38abce4c81336e2e9.tar.gz | |
updated for version 7.3.260v7.3.260
Problem: CursorHold triggers on an incomplete mapping. (Will Gray)
Solution: Don't trigger CursorHold when there is typeahead.
| -rw-r--r-- | src/fileio.c | 7 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/fileio.c b/src/fileio.c index 6355c7911..411328787 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -9044,7 +9044,10 @@ trigger_cursorhold() { int state; - if (!did_cursorhold && has_cursorhold() && !Recording + if (!did_cursorhold + && has_cursorhold() + && !Recording + && typebuf.tb_len == 0 #ifdef FEAT_INS_EXPAND && !ins_compl_active() #endif @@ -9935,6 +9938,8 @@ match_file_pat(pattern, prog, fname, sfname, tail, allow_dirs) if ((c == ';' || c == '>') && match == FALSE) { *pattern = NUL; /* Terminate the string */ + /* TODO: match with 'filetype' of buffer that "fname" comes + * from. */ match = mch_check_filetype(fname, type_start); *pattern = c; /* Restore the terminator */ type_start = pattern + 1; diff --git a/src/version.c b/src/version.c index 7359e14b2..a254af0e6 100644 --- a/src/version.c +++ b/src/version.c @@ -710,6 +710,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 260, +/**/ 259, /**/ 258, |