Merge from mainline.

diff --cc src/ChangeLog
index 353f9c2d64a9e664e16fec1e508f165c66901394,a8755321a4d4137f15e7993e1def6964e1aaca77..b68c375b4a6a6929e82179c2e3e4fe2f84c48e30
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,40 -1,41 +1,76 @@@
- 2011-01-09  Paul Eggert  <eggert@cs.ucla.edu>
++2011-01-11  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +      Give a name FLOAT_TO_STRING_BUFSIZE to the constant 350.
 +      * lisp.h (FLOAT_TO_STRING_BUFSIZE): New macro.
 +      * data.c (Fnumber_to_string): Use it.
 +      * print.c (float_to_string, print_object): Likewise.
 +
 +      Include <unistd.h> unilaterally.
 +      * alloc.c, atimer.c, buffer.c, callproc.c, dired.c, dispnew.c, doc.c:
 +      * doprnt.c, editfns.c, emacs.c, fileio.c, filelock.c, fns.c:
 +      * getloadavg.c, getpagesize.h, gmalloc.c, image.c, keyboard.c:
 +      * lread.c, process.c, process.h, ralloc.c, regex.c, sysdep.c:
 +      * systty.h, term.c, termcap.c, xfns.c, xrdb.c, xselect.c, xsmfns.c:
 +      * xterm.c:
 +      Include <unistd.h> without worrying about HAVE_UNISTD_H, since
 +      unistd.h is always present now, possibly supplied by gnulib.
 +
 +      * mktime.c: Remove; moving to ../lib.
 +
 +      Use gnulib's mktime module.
 +      * deps.mk (mktime.o): Remove rule.
 +
 +      Use gnulib's ftoastr module.
 +      * print.c: Include ftoastr.h.
 +      (FLT_RADIX, DBL_MANT_DIG, DBL_DIG, DBL_MIN, DOUBLE_DIGITS_BOUND):
 +      Remove; no longer needed.
 +      (float_to_string): Use dtoastr rather than rolling our own code,
 +      which had an off-by-one bug on non-IEEE hosts.
 +
- 2011-01-08  Paul Eggert  <eggert@cs.ucla.edu>
- 
 +      Automate syncing from gnulib.
 +      * Makefile.in (lib): New macro.
 +      (ALL_CFLAGS): Add -I$(lib) -I$(srcdir)/../lib.
 +      ($(lib)/libgnu.a): New rule.
 +      (temacs$(EXEEXT)): Also link $(lib)/libgnu.a.
 +
+ 2011-01-11  Tassilo Horn  <tassilo@member.fsf.org>
+ 
+       * image.c (imagemagick_load_image, Finit_image_library): Free
+       intermediate image after creating a MagickWand from it.  Terminate
+       MagickWand environment after image loading.
+ 
+ 2011-01-10  Michael Albinus  <michael.albinus@gmx.de>
+ 
+       * dbusbind.c (Fdbus_register_service): Raise an error in case of
+       unexpected return values.
+       (Fdbus_register_method): Remove connection initialization.
+ 
+ 2011-01-10  Jan Moringen  <jan.moringen@uni-bielefeld.de>
+ 
+       * dbusbind.c (QCdbus_request_name_allow_replacement): New symbol;
+       used by Fdbus_register_service.
+       (QCdbus_request_name_replace_existing): Likewise.
+       (QCdbus_request_name_do_not_queue): Likewise.
+       (QCdbus_request_name_reply_primary_owner): Likewise.
+       (QCdbus_request_name_reply_in_queue): Likewise.
+       (QCdbus_request_name_reply_exists): Likewise.
+       (QCdbus_request_name_reply_already_owner): Likewise.
+       (Fdbus_register_service): New function.
+       (Fdbus_register_method): Use Fdbus_register_service to do the name
+       registration.
+       (syms_of_dbusbind): Add symbols dbus-register-service,
+       :allow-replacement, :replace-existing, :do-not-queue,
+       :primary-owner, :existing, :in-queue and :already-owner.
+ 
+ 2011-01-09  Chong Yidong  <cyd@stupidchicken.com>
+ 
+       * gtkutil.c (update_frame_tool_bar): Don't advance tool-bar index
+       when removing extra buttons.
+ 
+ 2011-01-08  Chong Yidong  <cyd@stupidchicken.com>
+ 
+       * fns.c (Fyes_or_no_p): Doc fix.
+ 
  2011-01-08  Andreas Schwab  <schwab@linux-m68k.org>
  
        * fns.c (Fyes_or_no_p): Add usage.

diff --cc src/fns.c
Simple merge

diff --cc src/image.c
Simple merge