Skip to content

Commit 851cd14

Browse files
committed
updated for version 7.3.260
Problem: CursorHold triggers on an incomplete mapping. (Will Gray) Solution: Don't trigger CursorHold when there is typeahead.
1 parent 12011cf commit 851cd14

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

src/fileio.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9044,7 +9044,10 @@ trigger_cursorhold()
90449044
{
90459045
int state;
90469046

9047-
if (!did_cursorhold && has_cursorhold() && !Recording
9047+
if (!did_cursorhold
9048+
&& has_cursorhold()
9049+
&& !Recording
9050+
&& typebuf.tb_len == 0
90489051
#ifdef FEAT_INS_EXPAND
90499052
&& !ins_compl_active()
90509053
#endif
@@ -9935,6 +9938,8 @@ match_file_pat(pattern, prog, fname, sfname, tail, allow_dirs)
99359938
if ((c == ';' || c == '>') && match == FALSE)
99369939
{
99379940
*pattern = NUL; /* Terminate the string */
9941+
/* TODO: match with 'filetype' of buffer that "fname" comes
9942+
* from. */
99389943
match = mch_check_filetype(fname, type_start);
99399944
*pattern = c; /* Restore the terminator */
99409945
type_start = pattern + 1;

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -709,6 +709,8 @@ static char *(features[]) =
709709

710710
static int included_patches[] =
711711
{ /* Add new patch number below this line */
712+
/**/
713+
260,
712714
/**/
713715
259,
714716
/**/

0 commit comments

Comments
 (0)