Merge branch 'trunk' into xwidget

Conflicts:
	src/Makefile.in
	src/keyboard.c
	src/termhooks.h

diff --cc configure.ac
index e750ffeba9625b46367c186e25e5e7dadc95f266,656255c0e9aaa83801963848d934c133e67152bc..67015b19e36fb74197a8bb9c92b43c6dd7ab3856
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -200,10 -200,24 +200,26 @@@ 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])
+ 
+ AC_ARG_WITH([file-notification],[AS_HELP_STRING([--with-file-notification=LIB],
+  [use a file notification library (LIB one of: yes, gfile, inotify, w32, no)])],
+  [ case "${withval}" in
+     y | ye | yes )    val=yes ;;
+     n | no )          val=no  ;;
+     g | gf | gfi | gfil | gfile )     val=gfile ;;
+     i | in | ino | inot | inoti | inotif | inotify )  val=inotify ;;
+     w | w3 | w32 )    val=w32 ;;
+     * ) AC_MSG_ERROR([`--with-file-notification=$withval' is invalid;
+ this option's value should be `yes', `no', `gfile', `inotify' or `w32'.
+ `yes' is a synonym for `w32' on MS-Windows, and for `gfile' otherwise.])
+     ;;
+    esac
+    with_file_notification=$val
+  ],
+  [with_file_notification=$with_features])
  
 +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 lisp/progmodes/cc-mode.el
Simple merge

diff --cc src/Makefile.in
index bf3c9bf3b6b1e9f27fc12fcd3dd455c175defa07,90083eb910fdd8763dbe4eea36f9ca3889ab08d9..8d8133c9e6c0dc439ce57a944c43248cbd7203ba
--- 1/src/Makefile.in
--- 2/src/Makefile.in
+++ b/src/Makefile.in
@@@ -344,10 -345,9 +354,10 @@@ ALL_CFLAGS=-Demacs $(MYCPPFLAGS) -I. -I
    $(C_SWITCH_MACHINE) $(C_SWITCH_SYSTEM) $(C_SWITCH_X_SITE) \
    $(GNUSTEP_CFLAGS) $(CFLAGS_SOUND) $(RSVG_CFLAGS) $(IMAGEMAGICK_CFLAGS) \
    $(LIBXML2_CFLAGS) $(DBUS_CFLAGS) $(XRANDR_CFLAGS) $(XINERAMA_CFLAGS) \
 +  $(WEBKIT_CFLAGS) $(CLUTTER_CFLAGS) $(GIR_CFLAGS) \
    $(SETTINGS_CFLAGS) $(FREETYPE_CFLAGS) $(FONTCONFIG_CFLAGS) \
    $(LIBOTF_CFLAGS) $(M17N_FLT_CFLAGS) $(DEPFLAGS) \
-   $(LIBGNUTLS_CFLAGS) \
+   $(LIBGNUTLS_CFLAGS) $(GFILENOTIFY_CFLAGS) \
    $(WARN_CFLAGS) $(WERROR_CFLAGS) $(CFLAGS)
  ALL_OBJC_CFLAGS=$(ALL_CFLAGS) $(GNU_OBJC_CFLAGS)
  
@@@ -373,14 -373,12 +383,14 @@@ 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 inotify.o \
+       doprnt.o intervals.o textprop.o composite.o xml.o $(NOTIFY_OBJ) \
 +      xwidget.o \
        profiler.o \
        $(MSDOS_OBJ) $(MSDOS_X_OBJ) $(NS_OBJ) $(CYGWIN_OBJ) $(FONT_OBJ) \
-       $(W32_OBJ) $(WINDOW_SYSTEM_OBJ)
+       $(W32_OBJ) $(WINDOW_SYSTEM_OBJ) $(XGSELOBJ)
  obj = $(base_obj) $(NS_OBJC_OBJ)
  
 +xwidget.o: xwidget.c xwidget.h
  ## Object files used on some machine or other.
  ## These go in the DOC file on all machines in case they are needed.
  ## Some of them have no DOC entries, but it does no harm to have them

diff --cc src/dispextern.h
Simple merge

diff --cc src/emacs.c
Simple merge

diff --cc src/keyboard.c
index 7c3056079be3629e6829725bb2ef5b3cff198faf,7cb4c4b91e32144d2dc1f2cde79070291de9a7be..6129fdd26c8a97e755ff499d49af03e4e3a733dc
--- 1/src/keyboard.c
--- 2/src/keyboard.c
+++ b/src/keyboard.c
@@@ -317,12 -314,9 +314,12 @@@ static Lisp_Object Qsave_session
  #ifdef HAVE_DBUS
  static Lisp_Object Qdbus_event;
  #endif
- #ifdef HAVE_INOTIFY
- static Lisp_Object Qfile_inotify;
- #endif /* HAVE_INOTIFY */
 +#ifdef HAVE_XWIDGETS
 +Lisp_Object Qxwidget_event;
 +#endif
+ #ifdef USE_FILE_NOTIFY
+ static Lisp_Object Qfile_notify;
+ #endif /* USE_FILE_NOTIFY */
  static Lisp_Object Qconfig_changed_event;
  
  /* Lisp_Object Qmouse_movement; - also an event header */
@@@ -6001,21 -5985,12 +6002,21 @@@ make_lispy_event (struct input_event *e
        }
  #endif /* HAVE_DBUS */
  
- #ifdef HAVE_INOTIFY
 +#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 */
 +
 +
+ #if defined HAVE_GFILENOTIFY || defined HAVE_INOTIFY
      case FILE_NOTIFY_EVENT:
        {
-         return Fcons (Qfile_inotify, event->arg);
+         return Fcons (Qfile_notify, event->arg);
        }
- #endif /* HAVE_INOTIFY */
+ #endif /* defined HAVE_GFILENOTIFY || defined HAVE_INOTIFY */
  
      case CONFIG_CHANGED_EVENT:
        return Fcons (Qconfig_changed_event,
@@@ -11033,13 -11013,9 +11039,13 @@@ syms_of_keyboard (void
    DEFSYM (Qdbus_event, "dbus-event");
  #endif
  
- #ifdef HAVE_INOTIFY
-   DEFSYM (Qfile_inotify, "file-inotify");
- #endif /* HAVE_INOTIFY */
 +#ifdef HAVE_XWIDGETS
 +  Qxwidget_event = intern ("xwidget-event");
 +  staticpro (&Qxwidget_event);
 +#endif /* HAVE_XWIDGETS */
+ #ifdef USE_FILE_NOTIFY
+   DEFSYM (Qfile_notify, "file-notify");
+ #endif /* USE_FILE_NOTIFY */
  
    DEFSYM (QCenable, ":enable");
    DEFSYM (QCvisible, ":visible");

diff --cc src/lisp.h
Simple merge

diff --cc src/termhooks.h
index cdb788cfb079fb1ebbbb9fcbbee52d094a8542c8,4f3fa9cb47f74db927825959d12d09b0c2927003..fdbeda076b708a04b7836d53e27e3fb8727273c5
--- 1/src/termhooks.h
--- 2/src/termhooks.h
+++ b/src/termhooks.h
@@@ -211,11 -211,8 +211,11 @@@ 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
 +#endif
- #if defined (HAVE_INOTIFY) || defined (HAVE_NTGUI)
+ #ifdef USE_FILE_NOTIFY
    /* File or directory was changed.  */
    , FILE_NOTIFY_EVENT
  #endif

diff --cc src/window.c
Simple merge

diff --cc src/xdisp.c
Simple merge