]> git.eshelyaron.com Git - emacs.git/commitdiff
fixing some unterminated ifdefs caused by the previous conflict resolution
authorJoakim Verona <joakim@verona.se>
Tue, 11 Dec 2012 11:11:08 +0000 (12:11 +0100)
committerJoakim Verona <joakim@verona.se>
Tue, 11 Dec 2012 11:11:08 +0000 (12:11 +0100)
src/keyboard.c
src/termhooks.h

index 313c57fbe514a2f290ee77bb110bebac7e63a4fc..5316ee986924188c99b5e9fbdaeae7ab0e5c8907 100644 (file)
@@ -3988,6 +3988,7 @@ kbd_buffer_get_event (KBOARD **kbp,
          obj = make_lispy_event (event);
          kbd_fetch_ptr = event + 1;
        }
+#endif      
 #ifdef HAVE_INOTIFY
       else if (event->kind == FILE_NOTIFY_EVENT)
         {
index 79af2f91feb1695b0722a893eddcecdb04ae2428..71e9eb3b7d265fd56865e2f09969b1d8b1d13717 100644 (file)
@@ -213,7 +213,7 @@ enum event_kind
 #ifdef HAVE_XWIDGETS
   /* events generated by xwidgets*/
    , XWIDGET_EVENT
-
+#endif
 #if defined (HAVE_INOTIFY) || defined (HAVE_NTGUI)
   /* File or directory was changed.  */
   , FILE_NOTIFY_EVENT