not compiling yet

diff --cc configure.ac
Simple merge

diff --cc lisp/net/browse-url.el
Simple merge

diff --cc src/Makefile.in
Simple merge

diff --cc src/dispextern.h
Simple merge

diff --cc src/dispnew.c
Simple merge

diff --cc src/emacs.c
Simple merge

diff --cc src/emacsgtkfixed.c
index 5f90a5b90aab4e55f2a3db81285d7e052152c5c9,d10185072cc804497825d769d6210904b8ded4da..d23f3e21f2472fe8fa1054fbe64bcf8c72d29d70
--- 1/src/emacsgtkfixed.c
--- 2/src/emacsgtkfixed.c
+++ b/src/emacsgtkfixed.c
@@@ -26,9 -26,34 +26,36 @@@ along with GNU Emacs.  If not, see <htt
  #include "lisp.h"
  #include "frame.h"
  #include "xterm.h"
 -
 +#ifdef HAVE_XWIDGETS
 +#include "xwidget.h"
 +#endif
+ /* Silence a bogus diagnostic; see GNOME bug 683906.  */
+ #if (__GNUC__ == 4 && 6 <= __GNUC_MINOR__) || 4 < __GNUC__
+ # pragma GCC diagnostic push
+ # pragma GCC diagnostic ignored "-Wunused-local-typedefs"
+ #endif
+ 
+ #define EMACS_TYPE_FIXED emacs_fixed_get_type ()
+ #define EMACS_FIXED(obj) \
+   G_TYPE_CHECK_INSTANCE_CAST (obj, EMACS_TYPE_FIXED, EmacsFixed)
+ 
+ typedef struct _EmacsFixed EmacsFixed;
+ typedef struct _EmacsFixedPrivate EmacsFixedPrivate;
+ typedef struct _EmacsFixedClass EmacsFixedClass;
+ 
+ struct _EmacsFixed
+ {
+   GtkFixed container;
+ 
+   /*< private >*/
+   EmacsFixedPrivate *priv;
+ };
+ 
+ struct _EmacsFixedClass
+ {
+   GtkFixedClass parent_class;
+ };
+ 
  struct _EmacsFixedPrivate
  {
    struct frame *f;

diff --cc src/keyboard.c
Simple merge

diff --cc src/lisp.h
Simple merge

diff --cc src/print.c
Simple merge

diff --cc src/window.c
Simple merge

diff --cc src/xdisp.c
Simple merge

diff --cc src/xterm.c
Simple merge