Merge from mainline.

diff --cc src/ChangeLog
index d355e79163e08fc1f5fb5b2af44cb7d872ecac3b,77e80ed0536dbf1360b34b8f820be35bac8340d8..afa404ca7c109098f7d39faa04b7b9f9770ae71a
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,13 -1,25 +1,35 @@@
 +2010-01-05  Jan Djärv  <jan.h.d@swipnet.se>
 +
 +      * 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  <cyd@stupidchicken.com>
+ 
+       * keyboard.c (read_key_sequence): Catch keyboard switch after
+       making a new tty frame (Bug#5095).
+ 
+ 2010-01-05  Kenichi Handa  <handa@m17n.org>
+ 
+       * fontset.c (fontset_find_font): Fix getting the frame pointer.
+ 
+ 2010-01-04  Stefan Monnier  <monnier@iro.umontreal.ca>
+ 
+       * 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  <michael.albinus@gmx.de>
+ 
+       * 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  <cyd@stupidchicken.com>