Mercurial > vim
changeset 2976:cb4682b95909 v7.3.260
updated for version 7.3.260
Problem: CursorHold triggers on an incomplete mapping. (Will Gray)
Solution: Don't trigger CursorHold when there is typeahead.
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Wed, 20 Jul 2011 18:29:39 +0200 |
| parents | 0f64f07947d7 |
| children | 1d1065c2e7fa |
| files | src/fileio.c src/version.c |
| diffstat | 2 files changed, 8 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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, sfn 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;