some conflict resolution

diff --cc configure.ac
index e649b6725e96db502426e39d678dc8547108dc7c,f721c02f71fccf0ea6cc23eeacd5af668b9897fa..5b889cb2d8afa7a5890a81a53ada4bc45921a604
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -185,9 -185,8 +185,10 @@@ OPTION_DEFAULT_ON([gconf],[don't compil
  OPTION_DEFAULT_ON([gsettings],[don't compile with GSettings support])
  OPTION_DEFAULT_ON([selinux],[don't compile with SELinux support])
  OPTION_DEFAULT_ON([gnutls],[don't use -lgnutls for SSL/TLS support])
+ OPTION_DEFAULT_ON([inotify],[don't compile with inotify (file-watch) support])
  
 +OPTION_DEFAULT_OFF([xwidgets],[enable use of some gtk widgets it Emacs buffers])
 +
  ## For the times when you want to build Emacs but don't have
  ## a suitable makeinfo, and can live without the manuals.
  dnl http://lists.gnu.org/archive/html/emacs-devel/2008-04/msg01844.html

diff --cc src/Makefile.in
index 88e1fc544d0d1b772189e197a92a4196b79ce6ad,5f5fdfdc5eb325bb3fb8eecd98e921ac829075f2..fe3a15f193aa2e721e563d2359a059f259dc6ab9
--- 1/src/Makefile.in
--- 2/src/Makefile.in
+++ b/src/Makefile.in
@@@ -354,8 -352,7 +362,8 @@@ base_obj = dispnew.o frame.o scroll.o x
        syntax.o $(UNEXEC_OBJ) bytecode.o \
        process.o gnutls.o callproc.o \
        region-cache.o sound.o atimer.o \
-       doprnt.o intervals.o textprop.o composite.o xml.o \
+       doprnt.o intervals.o textprop.o composite.o xml.o inotify.o \
 +      xwidget.o \
        profiler.o \
        $(MSDOS_OBJ) $(MSDOS_X_OBJ) $(NS_OBJ) $(CYGWIN_OBJ) $(FONT_OBJ) \
        $(W32_OBJ) $(WINDOW_SYSTEM_OBJ)

diff --cc src/emacs.c
Simple merge

diff --cc src/keyboard.c
index 9b5e0c5865dfab3bc79f5e69fc0b56009ab9b432,e2a0e23dd4a151bd15472a9a0b84780d4b149028..313c57fbe514a2f290ee77bb110bebac7e63a4fc
--- 1/src/keyboard.c
--- 2/src/keyboard.c
+++ b/src/keyboard.c
@@@ -319,9 -322,9 +322,12 @@@ static Lisp_Object Qsave_session
  #ifdef HAVE_DBUS
  static Lisp_Object Qdbus_event;
  #endif
 +#ifdef HAVE_XWIDGETS
 +Lisp_Object Qxwidget_event;
 +#endif
+ #ifdef HAVE_INOTIFY
+ static Lisp_Object Qfile_inotify;
+ #endif /* HAVE_INOTIFY */
  static Lisp_Object Qconfig_changed_event;
  
  /* Lisp_Object Qmouse_movement; - also an event header */
@@@ -3964,12 -3979,12 +3982,18 @@@ kbd_buffer_get_event (KBOARD **kbp
          kbd_fetch_ptr = event + 1;
        }
  #endif
 +#ifdef HAVE_XWIDGETS      
 +      else if (event->kind == XWIDGET_EVENT)
 +      {
 +        obj = make_lispy_event (event);
 +        kbd_fetch_ptr = event + 1;
 +      }
+ #ifdef HAVE_INOTIFY
+       else if (event->kind == FILE_NOTIFY_EVENT)
+         {
+           obj = make_lispy_event (event);
+           kbd_fetch_ptr = event + 1;
+         }
  #endif
        else if (event->kind == CONFIG_CHANGED_EVENT)
        {
@@@ -5883,13 -5898,14 +5907,23 @@@ make_lispy_event (struct input_event *e
        return Fcons (Qdbus_event, event->arg);
        }
  #endif /* HAVE_DBUS */
- #endif
+ 
 +#ifdef HAVE_XWIDGETS
 +    case XWIDGET_EVENT:
 +      {
 +        printf("cool, an xwidget event arrived in make_lispy_event!\n");
 +        return  Fcons (Qxwidget_event,event->arg);
 +      }
++#endif /* HAVE_XWIDGETS */
++
++
+ #ifdef HAVE_INOTIFY
+     case FILE_NOTIFY_EVENT:
+       {
+         return Fcons (Qfile_inotify, event->arg);
+       }
+ #endif /* HAVE_INOTIFY */
+ 
      case CONFIG_CHANGED_EVENT:
        return Fcons (Qconfig_changed_event,
                        Fcons (event->arg,
@@@ -11353,10 -11373,10 +11391,14 @@@ syms_of_keyboard (void
    DEFSYM (Qdbus_event, "dbus-event");
  #endif
  
- #endif
 +#ifdef HAVE_XWIDGETS
 +  Qxwidget_event = intern ("xwidget-event");
 +  staticpro (&Qxwidget_event);
++#endif /* HAVE_XWIDGETS */
+ #ifdef HAVE_INOTIFY
+   DEFSYM (Qfile_inotify, "file-inotify");
+ #endif /* HAVE_INOTIFY */
+ 
    DEFSYM (QCenable, ":enable");
    DEFSYM (QCvisible, ":visible");
    DEFSYM (QChelp, ":help");

diff --cc src/lisp.h
Simple merge

diff --cc src/termhooks.h
index d4b472cfb24c3acb056a76c62c10374252d54df1,1a261bacdc5b91791caa68760995d3b1e4bd4a69..79af2f91feb1695b0722a893eddcecdb04ae2428
--- 1/src/termhooks.h
--- 2/src/termhooks.h
+++ b/src/termhooks.h
@@@ -210,10 -210,12 +210,15 @@@ enum event_kin
    /* Non-key system events (e.g. application menu events) */
    , NS_NONKEY_EVENT
  #endif
 +#ifdef HAVE_XWIDGETS
 +  /* events generated by xwidgets*/
 +   , XWIDGET_EVENT
+ 
+ #if defined (HAVE_INOTIFY) || defined (HAVE_NTGUI)
+   /* File or directory was changed.  */
+   , FILE_NOTIFY_EVENT
  #endif
+ 
  };
  
  /* If a struct input_event has a kind which is SELECTION_REQUEST_EVENT

diff --cc src/window.c
Simple merge

diff --cc src/xdisp.c
Simple merge