diff options
| author | Bram Moolenaar <Bram@vim.org> | 2006-02-09 23:48:02 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2006-02-09 23:48:02 +0000 |
| commit | cf0c554e3f841eefd3208aee3f6359da3e6395f4 (patch) | |
| tree | c80b9eafad4e38a20357f2fde5a4581ca35d575b | |
| parent | 8b6144bdfe9efccab5045ebef9f3d5dcf5ee9d00 (diff) | |
| download | vim-cf0c554e3f841eefd3208aee3f6359da3e6395f4.zip | |
updated for version 7.0195
| -rw-r--r-- | src/getchar.c | 2 | ||||
| -rw-r--r-- | src/normal.c | 4 | ||||
| -rw-r--r-- | src/vim.h | 5 |
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, @@ -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[]. |