auto upstream

diff --cc configure.ac
Simple merge

diff --cc lisp/mail/rmail.el
index ec35cc59b2666f328c3158399540dd2a93e247ea,ec35cc59b2666f328c3158399540dd2a93e247ea..096b53c6cab67594c735757629847f31c487120b
--- 1/lisp/mail/rmail.el
--- 2/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@@ -4622,7 -4622,7 +4622,7 @@@ With prefix argument N moves forward N 
  
  ;;;***
  \f
--;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "f1937f85a1258de8880a089fa5ae5621")
++;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "c106528cab2def0306822563a9083967")
  ;;; Generated autoloads from rmailmm.el
  
  (autoload 'rmail-mime "rmailmm" "\

diff --cc src/Makefile.in
index f430c787d56cb2826c4b0995809845693b25633a,045c6df1dae073725eff707984369e51c5010eb0..eb4e890381254c0f3a86cf08037cdc08bcef7fdd
--- 1/src/Makefile.in
--- 2/src/Makefile.in
+++ b/src/Makefile.in
@@@ -412,10 -400,9 +412,10 @@@ otherobj= $(TERMCAP_OBJ) $(PRE_ALLOC_OB
  ## Note that SunOS needs -lm to come before -lc; otherwise, you get
  ## duplicated symbols.  If the standard libraries were compiled
  ## with GCC, we might need LIB_GCC again after them.
- LIBES = $(LIBS) $(W32_LIBS) $(LIBX_BASE) $(LIBIMAGE) \
+ LIBES = $(LIBS) $(W32_LIBS) $(LIBS_GNUSTEP) $(LIBX_BASE) $(LIBIMAGE) \
     $(LIBX_OTHER) $(LIBSOUND) \
     $(RSVG_LIBS) $(IMAGEMAGICK_LIBS) $(LIB_CLOCK_GETTIME) \
 +   $(WEBKIT_LIBS) $(CLUTTER_LIBS) $(GIR_LIBS) \
     $(LIB_EACCESS) $(LIB_TIMER_TIME) $(DBUS_LIBS) \
     $(LIB_EXECINFO) \
     $(LIBXML2_LIBS) $(LIBGPM) $(LIBRESOLV) $(LIBS_SYSTEM) \

diff --cc src/dispextern.h
Simple merge

diff --cc src/xdisp.c
Simple merge