updated for version 7.3.260

Problem:    CursorHold triggers on an incomplete mapping. (Will Gray)
Solution:   Don't trigger CursorHold when there is typeahead.

diff --git a/src/fileio.c b/src/fileio.c
index 6355c7911b29b40dfbf3a06d9c41ef40b5275ac4..4113287870936f20a0f6b9f1f8289d789856147f 100644 (file)
--- 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 7359e14b2956807eb8600cc7e6870ba1ba9e2da2..a254af0e630ab0d022ac9da572ce4d5e15305642 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -709,6 +709,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    260,
 /**/
     259,
 /**/