diff options
| author | Joakim Verona | 2012-12-11 12:02:20 +0100 |
|---|---|---|
| committer | Joakim Verona | 2012-12-11 12:02:20 +0100 |
| commit | 5ccd4f20470d8e216ca3eae26339100a5eab52f1 (patch) | |
| tree | 70caca485fbaef0dcce16a811908c4b9b121ee1e /src/termhooks.h | |
| parent | c0b95835acf65071ac1d740d15f7bcaa55c2a04b (diff) | |
| parent | c6afe371b0218154957bbef17c3f8bda5377b7c8 (diff) | |
| download | emacs-5ccd4f20470d8e216ca3eae26339100a5eab52f1.tar.gz emacs-5ccd4f20470d8e216ca3eae26339100a5eab52f1.zip | |
some conflict resolution
Diffstat (limited to 'src/termhooks.h')
| -rw-r--r-- | src/termhooks.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/termhooks.h b/src/termhooks.h index d4b472cfb24..79af2f91feb 100644 --- a/src/termhooks.h +++ b/src/termhooks.h | |||
| @@ -213,7 +213,12 @@ enum event_kind | |||
| 213 | #ifdef HAVE_XWIDGETS | 213 | #ifdef HAVE_XWIDGETS |
| 214 | /* events generated by xwidgets*/ | 214 | /* events generated by xwidgets*/ |
| 215 | , XWIDGET_EVENT | 215 | , XWIDGET_EVENT |
| 216 | |||
| 217 | #if defined (HAVE_INOTIFY) || defined (HAVE_NTGUI) | ||
| 218 | /* File or directory was changed. */ | ||
| 219 | , FILE_NOTIFY_EVENT | ||
| 216 | #endif | 220 | #endif |
| 221 | |||
| 217 | }; | 222 | }; |
| 218 | 223 | ||
| 219 | /* If a struct input_event has a kind which is SELECTION_REQUEST_EVENT | 224 | /* If a struct input_event has a kind which is SELECTION_REQUEST_EVENT |