From: Jan Djärv Date: Tue, 5 Jan 2010 14:42:39 +0000 (+0100) Subject: Merge from mainline. X-Git-Tag: emacs-pretest-23.1.92~87 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2889df585ae164ccf8fc57ffdbb432dfcd75e870;p=emacs.git Merge from mainline. --- 2889df585ae164ccf8fc57ffdbb432dfcd75e870 diff --cc src/ChangeLog index d355e79163e,77e80ed0536..afa404ca7c1 --- a/src/ChangeLog +++ b/src/ChangeLog @@@ -1,13 -1,25 +1,35 @@@ +2010-01-05 Jan Djärv + + * xterm.c (x_new_font): Move code for setting rows/cols before + resizing ... + (x_set_window_size): ... to here. bug #2568. + + * gtkutil.c (xg_clear_under_internal_border): New function. + (xg_frame_resized, xg_frame_set_char_size): Call + xg_clear_under_internal_border. + (xg_update_scrollbar_pos): Clear under old scroll bar position. + 2010-01-05 Chong Yidong + + * keyboard.c (read_key_sequence): Catch keyboard switch after + making a new tty frame (Bug#5095). + + 2010-01-05 Kenichi Handa + + * fontset.c (fontset_find_font): Fix getting the frame pointer. + + 2010-01-04 Stefan Monnier + + * dbusbind.c (xd_remove_watch): Avoid trying to convert a void* to + Lisp_Object, preferring to convert a lisp_Object to a void* instead. + (Fdbus_init_bus): Use XHASH to get a scalar value from a Lisp_Object. + + 2010-01-03 Michael Albinus + + * dbusbind.c (xd_add_watch): Improve debug message. + (xd_remove_watch): Improve debug message. If DATA is the session + bus, unset D-Bus session environment. + (Fdbus_init_bus): Pass the bus as argument to + dbus_connection_set_watch_functions. (Bug#5283) 2010-01-01 Chong Yidong