Merge from mainline.

1 files changed, 39 insertions, 3 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 353f9c2d64a..b68c375b4a6 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,4 +1,4 @@
-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.
@@ -27,14 +27,50 @@
         (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.