upstream merge

diff --cc configure.ac
Simple merge

diff --cc src/buffer.c
Simple merge

diff --cc src/dispnew.c
Simple merge

diff --cc src/emacs.c
index 85a5a8243fb358c7fd0afc9139e34c2bbe673ec1,b4052b851d770b0660abf1c6a03b38f80d408849..825b3c17e76c7d7eb708ca4b8db300a1984ad267
--- 1/src/emacs.c
--- 2/src/emacs.c
+++ b/src/emacs.c
@@@ -65,10 -66,6 +66,9 @@@ along with GNU Emacs.  If not, see <htt
  #include "buffer.h"
  #include "window.h"
  
- #include "systty.h"
 +#ifdef HAVE_XWIDGETS
 +# include "xwidget.h"
 +#endif
  #include "atimer.h"
  #include "blockinput.h"
  #include "syssignal.h"

diff --cc src/emacsgtkfixed.h
index 7364d906cf6f49b9f96edff0b2aa864cfdad9163,a969a6d265b2ccbc556ebd482a7402c4e898896b..3e5bee4a434acd522ace88c12df4dbf981a7f717
--- 1/src/emacsgtkfixed.h
--- 2/src/emacsgtkfixed.h
+++ b/src/emacsgtkfixed.h
@@@ -23,37 -23,11 +23,39 @@@ along with GNU Emacs.  If not, see <htt
  
  #include <gtk/gtk.h>
  
+ struct frame;
+ 
  G_BEGIN_DECLS
  
 +struct frame;
 +
 +#define EMACS_TYPE_FIXED                  (emacs_fixed_get_type ())
 +#define EMACS_FIXED(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), EMACS_TYPE_FIXED, EmacsFixed))
 +#define EMACS_FIXED_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), EMACS_TYPE_FIXED, EmacsFixedClass))
 +#define EMACS_IS_FIXED(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EMACS_TYPE_FIXED))
 +#define EMACS_IS_FIXED_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), EMACS_TYPE_FIXED))
 +#define EMACS_FIXED_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), EMACS_TYPE_FIXED, EmacsFixedClass))
 +
 +//typedef struct _EmacsFixed              EmacsFixed;
 +typedef struct _EmacsFixedPrivate       EmacsFixedPrivate;
 +typedef struct _EmacsFixedClass         EmacsFixedClass;
 +
 +struct _EmacsFixed
 +{
 +  GtkFixed container;
 +
 +  /*< private >*/
 +  EmacsFixedPrivate *priv;
 +};
 +
 +
 +struct _EmacsFixedClass
 +{
 +  GtkFixedClass parent_class;
 +};
 +
  extern GtkWidget *emacs_fixed_new (struct frame *f);
 +extern GType emacs_fixed_get_type (void);
  
  G_END_DECLS
  

diff --cc src/keyboard.c
Simple merge

diff --cc src/lisp.h
Simple merge

diff --cc src/print.c
index 21402fc4bea5016362f4a95e0d5a677c5302406e,6f868ceff84ff49f71bfe3d353e1de3e7da95376..2443bbaf9285644d9f88098b552fb95b4b8d0748
--- 1/src/print.c
--- 2/src/print.c
+++ b/src/print.c
@@@ -24,24 -24,15 +24,19 @@@ along with GNU Emacs.  If not, see <htt
  
  #include "lisp.h"
  #include "character.h"
+ #include "coding.h"
  #include "buffer.h"
  #include "charset.h"
- #include "keyboard.h"
  #include "frame.h"
- #include "window.h"
  #include "process.h"
- #include "dispextern.h"
  #include "disptab.h"
- #include "termchar.h"
  #include "intervals.h"
  #include "blockinput.h"
- #include "termhooks.h"                /* For struct terminal.  */
- #include "font.h"
  
 +#ifdef HAVE_XWIDGETS
 +# include "xwidget.h"
 +#endif
 +
  #include <c-ctype.h>
  #include <float.h>
  #include <ftoastr.h>

diff --cc src/termhooks.h
Simple merge

diff --cc src/window.c
Simple merge

diff --cc src/xdisp.c
Simple merge

diff --cc src/xterm.c
index d32ca0f3f3a8651324e7d533a46796b55ddc4e54,691ad05efe182f8a3a717b4be3bde4f2eb3b7b6f..000e1f84b36c0a0ce8119c365790d3616963b5b9
--- 1/src/xterm.c
--- 2/src/xterm.c
+++ b/src/xterm.c
@@@ -58,17 -57,11 +57,14 @@@ along with GNU Emacs.  If not, see <htt
  #include <fcntl.h>
  #include <errno.h>
  #include <sys/stat.h>
- /* Caused redefinition of DBL_DIG on Netbsd; seems not to be needed.  */
- /* #include <sys/param.h>  */
- 
- #include "charset.h"
  #include "character.h"
  #include "coding.h"
+ #include "composite.h"
  #include "frame.h"
  #include "dispextern.h"
 +#ifdef HAVE_XWIDGETS
 +# include "xwidget.h"
 +#endif
  #include "fontset.h"
  #include "termhooks.h"
  #include "termopts.h"