summaryrefslogtreecommitdiff
path: root/src/fileio.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/fileio.c')
-rw-r--r--src/fileio.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/fileio.c b/src/fileio.c
index 6355c791..41132878 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;