updated for version 7.0-104

diff --git a/src/edit.c b/src/edit.c
index aa03d8d87bbc4f89e23d39b29d9a2a2f210e2040..94456aea7fd706a0c95c4d6ac9baf6a160c4aaee 100644 (file)
--- a/src/edit.c
+++ b/src/edit.c
@@ -707,6 +707,11 @@ edit(cmdchar, startln, count)
        lastc = c;                      /* remember previous char for CTRL-D */
        c = safe_vgetc();
 
+#ifdef FEAT_AUTOCMD
+       /* Don't want K_CURSORHOLD for the second key, e.g., after CTRL-V. */
+       did_cursorhold = TRUE;
+#endif
+
 #ifdef FEAT_RIGHTLEFT
        if (p_hkmap && KeyTyped)
            c = hkmap(c);               /* Hebrew mode mapping */
@@ -1389,6 +1394,12 @@ normalchar:
            break;
        }   /* end of switch (c) */
 
+#ifdef FEAT_AUTOCMD
+       /* If typed something may trigger CursorHoldI again. */
+       if (c != K_CURSORHOLD)
+           did_cursorhold = FALSE;
+#endif
+
        /* If the cursor was moved we didn't just insert a space */
        if (arrow_used)
            inserted_space = FALSE;

diff --git a/src/fileio.c b/src/fileio.c
index 2e2b826ca8d1ea1470719588c01d87a8ba09a557..42181e17b22fa9afc7cf2be75b74a9d61058bd88 100644 (file)
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -8289,7 +8289,11 @@ trigger_cursorhold()
 {
     int                state;
 
-    if (!did_cursorhold && has_cursorhold() && !Recording)
+    if (!did_cursorhold && has_cursorhold() && !Recording
+#ifdef FEAT_INS_EXPAND
+           && !ins_compl_active()
+#endif
+           )
     {
        state = get_real_state();
        if (state == NORMAL_BUSY || (state & INSERT) != 0)

diff --git a/src/version.c b/src/version.c
index 6f535dcb5f4cc5baacbba9df4822bfced2311f48..2767ec86f56bc60947fe6806f5aad44af38db3a5 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    104,
 /**/
     103,
 /**/