From: Joakim Verona <joakim@verona.se>
Date: Tue, 11 Dec 2012 11:11:08 +0000 (+0100)
Subject: fixing some unterminated ifdefs caused by the previous conflict resolution
X-Git-Tag: emacs-25.0.90~3165
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=86f35ea2eaaf832b4d2eb88d55b9f77940aa11fc;p=emacs.git

fixing some unterminated ifdefs caused by the previous conflict resolution
---

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,
 	  obj = make_lispy_event (event);
 	  kbd_fetch_ptr = event + 1;
 	}
+#endif      
 #ifdef HAVE_INOTIFY
       else if (event->kind == FILE_NOTIFY_EVENT)
         {
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
 #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