diff options
| author | Joakim Verona | 2012-12-11 12:11:08 +0100 |
|---|---|---|
| committer | Joakim Verona | 2012-12-11 12:11:08 +0100 |
| commit | 86f35ea2eaaf832b4d2eb88d55b9f77940aa11fc (patch) | |
| tree | b3218708b443f26df5f56009f6b61a25bc97fc4d /src | |
| parent | 5ccd4f20470d8e216ca3eae26339100a5eab52f1 (diff) | |
| download | emacs-86f35ea2eaaf832b4d2eb88d55b9f77940aa11fc.tar.gz emacs-86f35ea2eaaf832b4d2eb88d55b9f77940aa11fc.zip | |
fixing some unterminated ifdefs caused by the previous conflict resolution
Diffstat (limited to 'src')
| -rw-r--r-- | src/keyboard.c | 1 | ||||
| -rw-r--r-- | src/termhooks.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/keyboard.c b/src/keyboard.c index 313c57fbe51..5316ee98692 100644 --- a/src/keyboard.c +++ b/src/keyboard.c | |||
| @@ -3988,6 +3988,7 @@ kbd_buffer_get_event (KBOARD **kbp, | |||
| 3988 | obj = make_lispy_event (event); | 3988 | obj = make_lispy_event (event); |
| 3989 | kbd_fetch_ptr = event + 1; | 3989 | kbd_fetch_ptr = event + 1; |
| 3990 | } | 3990 | } |
| 3991 | #endif | ||
| 3991 | #ifdef HAVE_INOTIFY | 3992 | #ifdef HAVE_INOTIFY |
| 3992 | else if (event->kind == FILE_NOTIFY_EVENT) | 3993 | else if (event->kind == FILE_NOTIFY_EVENT) |
| 3993 | { | 3994 | { |
diff --git a/src/termhooks.h b/src/termhooks.h index 79af2f91feb..71e9eb3b7d2 100644 --- a/src/termhooks.h +++ b/src/termhooks.h | |||
| @@ -213,7 +213,7 @@ 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 | 216 | #endif | |
| 217 | #if defined (HAVE_INOTIFY) || defined (HAVE_NTGUI) | 217 | #if defined (HAVE_INOTIFY) || defined (HAVE_NTGUI) |
| 218 | /* File or directory was changed. */ | 218 | /* File or directory was changed. */ |
| 219 | , FILE_NOTIFY_EVENT | 219 | , FILE_NOTIFY_EVENT |