merge from upstream

diff --cc configure
Simple merge

diff --cc configure.in
Simple merge

diff --cc src/Makefile.in
index 278ae5972ad91d7b9b83af98b21fbb13f0454eeb,0d496aea73a9dd51c4aa9b54a8ff77c8107fa449..3323a44f49c84e95370aa7603bd1e19d041598c9
--- 1/src/Makefile.in
--- 2/src/Makefile.in
+++ b/src/Makefile.in
@@@ -350,13 -350,11 +350,13 @@@ obj=    dispnew.o frame.o scroll.o xdis
        alloc.o data.o doc.o editfns.o callint.o \
        eval.o floatfns.o fns.o font.o print.o lread.o \
        syntax.o $(UNEXEC_OBJ) bytecode.o \
-       process.o callproc.o \
+       process.o gnutls.o callproc.o \
        region-cache.o sound.o atimer.o \
        doprnt.o strftime.o intervals.o textprop.o composite.o md5.o xml.o \
 +      xwidget.o \
        $(MSDOS_OBJ) $(MSDOS_X_OBJ) $(NS_OBJ) $(CYGWIN_OBJ) $(FONT_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_MACHINE_OBJECTS = dosfns.o msdos.o \

diff --cc src/dispextern.h
Simple merge

diff --cc src/dispnew.c
Simple merge

diff --cc src/emacs.c
Simple merge

diff --cc src/frame.h
Simple merge

diff --cc src/gtkutil.c
Simple merge

diff --cc src/insdel.c
Simple merge

diff --cc src/keyboard.c
Simple merge

diff --cc src/termhooks.h
Simple merge

diff --cc src/window.c
Simple merge

diff --cc src/xdisp.c
index f466fae857441440b24f251b715267d6c7befdb2,4c007e572cecfe21490c91c81e5e4e9df52f726d..beecebca2207e39c042a411fb4ce330a61ec03e9
--- 1/src/xdisp.c
--- 2/src/xdisp.c
+++ b/src/xdisp.c
@@@ -1037,9 -1038,8 +1040,9 @@@ static int next_element_from_c_string (
  static int next_element_from_buffer (struct it *);
  static int next_element_from_composition (struct it *);
  static int next_element_from_image (struct it *);
 +static int next_element_from_xwidget(struct it *);
  static int next_element_from_stretch (struct it *);
- static void load_overlay_strings (struct it *, int);
+ static void load_overlay_strings (struct it *, EMACS_INT);
  static int init_from_display_pos (struct it *, struct window *,
                                    struct display_pos *);
  static void reseat_to_string (struct it *, const unsigned char *,

diff --cc src/xterm.c
Simple merge