comparison src/ChangeLog @ 111307:707be8bc83af

merge trunk
author Kenichi Handa <handa@m17n.org>
date Mon, 01 Nov 2010 16:53:08 +0900
parents 00c31cf912da 83641cd010c7
children 8ddff723bc6f
comparison
equal deleted inserted replaced
111238:00c31cf912da 111307:707be8bc83af
64 function. 64 function.
65 (x_draw_glyph_string): Handle the case GLYPHLESS_GLYPH. 65 (x_draw_glyph_string): Handle the case GLYPHLESS_GLYPH.
66 66
67 * nsterm.m (ns_draw_glyph_string): Handle the case 67 * nsterm.m (ns_draw_glyph_string): Handle the case
68 GLYPHLESS_GLYPH (the detail is not yet implemented). 68 GLYPHLESS_GLYPH (the detail is not yet implemented).
69
70 2010-10-31 Glenn Morris <rgm@gnu.org>
71
72 * xterm.c (x_connection_closed) [USE_X_TOOLKIT]: Fix merge, maybe.
73
74 * frame.c (syms_of_frame) <tool-bar-mode>:
75 Default to nil if !HAVE_WINDOW_SYSTEM. (Bug#7299)
76
77 2010-10-31 Chong Yidong <cyd@stupidchicken.com>
78
79 * xterm.c (x_connection_closed): Print informative error message
80 when aborting on GTK. This requires using shut_down_emacs
81 directly instead of Fkill_emacs.
82
83 2010-10-31 Michael Albinus <michael.albinus@gmx.de>
84
85 * dbusbind.c (Fdbus_call_method_asynchronously)
86 (Fdbus_register_signal, Fdbus_register_method): Check, whether
87 `dbus-registered-objects-table' is initialized.
88
89 2010-10-29 Eli Zaretskii <eliz@gnu.org>
90
91 * emacs.c (main): Call syms_of_filelock unconditionally.
92
93 * filelock.c (syms_of_filelock): Move out of #ifdef CLASH_DETECTION
94 clause, but keep part of it conditioned on CLASH_DETECTION.
95
96 2010-10-29 Glenn Morris <rgm@gnu.org>
97
98 * nsfns.m (Fx-display-save-under, Fx-open-connection)
99 (Fxw-color-defined-p, Fxw-display-color-p, Fx-show-tip):
100 * w32fns.c (Fxw_color_defined_p, Fx_open_connection):
101 * xfns.c (Fxw_color_defined_p, Fx_open_connection):
102 Sync docs between X, W32, NS.
103
104 * buffer.c (syms_of_buffer) <abbrev-mode, transient-mark-mode>:
105 * frame.c (syms_of_frame) <tool-bar-mode>: Move doc here from Lisp.
69 106
70 2010-10-26 Juanma Barranquero <lekktu@gmail.com> 107 2010-10-26 Juanma Barranquero <lekktu@gmail.com>
71 108
72 * eval.c (init_eval_once): Set max_lisp_eval_depth to 600; 109 * eval.c (init_eval_once): Set max_lisp_eval_depth to 600;
73 otherwise, bootstrapping on Windows fails to compile macroexp.el. 110 otherwise, bootstrapping on Windows fails to compile macroexp.el.