diff options
| author | Joakim Verona | 2013-06-12 12:32:25 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-06-12 12:32:25 +0200 |
| commit | e6fa6da6899bf1b4877b96c450eae3934085d560 (patch) | |
| tree | 48e6fda463d24a792ec8428fb8044a250ee2ff82 /src/termhooks.h | |
| parent | 4f0994366d33f8f76db4662cc126720866df3461 (diff) | |
| parent | 84d6f46535554f9f51aae3314313112e8d755c65 (diff) | |
| download | emacs-e6fa6da6899bf1b4877b96c450eae3934085d560.tar.gz emacs-e6fa6da6899bf1b4877b96c450eae3934085d560.zip | |
Merge branch 'trunk' into xwidget
Conflicts:
src/Makefile.in
src/keyboard.c
src/termhooks.h
Diffstat (limited to 'src/termhooks.h')
| -rw-r--r-- | src/termhooks.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/termhooks.h b/src/termhooks.h index cdb788cfb07..fdbeda076b7 100644 --- a/src/termhooks.h +++ b/src/termhooks.h | |||
| @@ -215,7 +215,7 @@ enum event_kind | |||
| 215 | /* events generated by xwidgets*/ | 215 | /* events generated by xwidgets*/ |
| 216 | , XWIDGET_EVENT | 216 | , XWIDGET_EVENT |
| 217 | #endif | 217 | #endif |
| 218 | #if defined (HAVE_INOTIFY) || defined (HAVE_NTGUI) | 218 | #ifdef USE_FILE_NOTIFY |
| 219 | /* File or directory was changed. */ | 219 | /* File or directory was changed. */ |
| 220 | , FILE_NOTIFY_EVENT | 220 | , FILE_NOTIFY_EVENT |
| 221 | #endif | 221 | #endif |