updated for version 7.0195

diff --git a/src/getchar.c b/src/getchar.c
index ff821cb02f59c7444a5bcab1e1edc1f78a5f4d61..5064c8d39b3ecb2bf3ccfa43fb326c0da78aebaf 100644 (file)
--- a/src/getchar.c
+++ b/src/getchar.c
@@ -1534,7 +1534,7 @@ vgetc()
                continue;
            }
 #endif
-#if defined(HAVE_GTK2) && defined(FEAT_MENU)
+#if defined(FEAT_GUI) && defined(HAVE_GTK2) && defined(FEAT_MENU)
            /* GTK: <F10> normally selects the menu, but it's passed until
             * here to allow mapping it.  Intercept and invoke the GTK
             * behavior if it's not mapped. */

diff --git a/src/normal.c b/src/normal.c
index 9e68b2b0733a70005b0e418c2cf0fee3c2bb7709..09410f03087aaa942f3f931dee8db14e1400cb37 100644 (file)
--- a/src/normal.c
+++ b/src/normal.c
@@ -3635,10 +3635,10 @@ add_to_showcmd(c)
     int                i;
     static int ignore[] =
     {
-#ifdef FEAT_GUI
+# ifdef FEAT_GUI
        K_VER_SCROLLBAR, K_HOR_SCROLLBAR,
        K_LEFTMOUSE_NM, K_LEFTRELEASE_NM,
-#endif
+# endif
        K_IGNORE,
        K_LEFTMOUSE, K_LEFTDRAG, K_LEFTRELEASE,
        K_MIDDLEMOUSE, K_MIDDLEDRAG, K_MIDDLERELEASE,

diff --git a/src/vim.h b/src/vim.h
index 7b7953273965f27d74f6c2a98fd899b9ba347c24..07acb562af255a6efcd19f9f0036a605222a28ce 100644 (file)
--- a/src/vim.h
+++ b/src/vim.h
@@ -1102,14 +1102,17 @@ enum auto_event
     EVENT_WINLEAVE,            /* before leaving a window */
     EVENT_ENCODINGCHANGED,     /* after changing the 'encoding' option */
     EVENT_CURSORHOLD,          /* cursor in same position for a while */
+    EVENT_CURSORHOLDI,         /* idem, in Insert mode */
     EVENT_FUNCUNDEFINED,       /* if calling a function which doesn't exist */
     EVENT_REMOTEREPLY,         /* upon string reception from a remote vim */
     EVENT_SWAPEXISTS,          /* found existing swap file */
     EVENT_SPELLFILEMISSING,    /* spell file missing */
+    EVENT_CURSORMOVED,         /* cursor was moved */
+    EVENT_CURSORMOVEDI,                /* cursor was moved in Insert mode */
     NUM_EVENTS                 /* MUST be the last one */
 };
 
-typedef enum auto_event EVENT_T;
+typedef enum auto_event event_T;
 
 /*
  * Values for index in highlight_attr[].