summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/getchar.c2
-rw-r--r--src/normal.c4
-rw-r--r--src/vim.h5
3 files changed, 7 insertions, 4 deletions
diff --git a/src/getchar.c b/src/getchar.c
index ff821cb02..5064c8d39 100644
--- 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 9e68b2b07..09410f030 100644
--- 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 7b7953273..07acb562a 100644
--- 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[].