From: Joakim Verona <joakim@verona.se>
Date: Sun, 30 Dec 2012 23:04:10 +0000 (+0100)
Subject: auto upstream
X-Git-Tag: emacs-25.0.90~3010
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=42a61fa6a6cbcfde79d812bbbba372d579dc1016;p=emacs.git

auto upstream
---

42a61fa6a6cbcfde79d812bbbba372d579dc1016
diff --cc lisp/mail/rmail.el
index ec35cc59b26,ec35cc59b26..096b53c6cab
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@@ -4622,7 -4622,7 +4622,7 @@@ With prefix argument N moves forward N 
  
  ;;;***
  
--;;;### (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 f430c787d56,045c6df1dae..eb4e8903812
--- a/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) \