merge trunk

1 files changed, 37 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 6128808a2a7..3375a46d39e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -67,6 +67,43 @@
         * nsterm.m (ns_draw_glyph_string): Handle the case
         GLYPHLESS_GLYPH (the detail is not yet implemented).
 
+2010-10-31  Glenn Morris  <rgm@gnu.org>
+
+        * xterm.c (x_connection_closed) [USE_X_TOOLKIT]: Fix merge, maybe.
+
+        * frame.c (syms_of_frame) <tool-bar-mode>:
+        Default to nil if !HAVE_WINDOW_SYSTEM.  (Bug#7299)
+
+2010-10-31  Chong Yidong  <cyd@stupidchicken.com>
+
+        * xterm.c (x_connection_closed): Print informative error message
+        when aborting on GTK.  This requires using shut_down_emacs
+        directly instead of Fkill_emacs.
+
+2010-10-31  Michael Albinus  <michael.albinus@gmx.de>
+
+        * dbusbind.c (Fdbus_call_method_asynchronously)
+        (Fdbus_register_signal, Fdbus_register_method): Check, whether
+        `dbus-registered-objects-table' is initialized.
+
+2010-10-29  Eli Zaretskii  <eliz@gnu.org>
+
+        * emacs.c (main): Call syms_of_filelock unconditionally.
+
+        * filelock.c (syms_of_filelock): Move out of #ifdef CLASH_DETECTION
+        clause, but keep part of it conditioned on CLASH_DETECTION.
+
+2010-10-29  Glenn Morris  <rgm@gnu.org>
+
+        * nsfns.m (Fx-display-save-under, Fx-open-connection)
+        (Fxw-color-defined-p, Fxw-display-color-p, Fx-show-tip):
+        * w32fns.c (Fxw_color_defined_p, Fx_open_connection):
+        * xfns.c (Fxw_color_defined_p, Fx_open_connection):
+        Sync docs between X, W32, NS.
+
+        * buffer.c (syms_of_buffer) <abbrev-mode, transient-mark-mode>:
+        * frame.c (syms_of_frame) <tool-bar-mode>: Move doc here from Lisp.
+
 2010-10-26  Juanma Barranquero  <lekktu@gmail.com>
 
         * eval.c (init_eval_once): Set max_lisp_eval_depth to 600;