Merge from mainline.

1 files changed, 66 insertions, 3 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index d6e7f2c9791..fd32d739bc0 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,66 @@
+2010-01-08  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * dispnew.c (change_frame_size_1): newwidth == FRAME_COLS  (f) must
+        also be true before we can return early (bug #5339).
+
+2010-01-06  David Reitter  <david.reitter@gmail.com>
+
+        * nsfns.m (ns_get_screen): Rewrite, returning NULL for non-NS.
+        (Fns_display_usable_bounds): Rewrite, computing bounds properly
+        (Bug#3233).
+
+2010-01-06  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * font.c (font_open_entity): Enable chache and call cached_font_ok
+        for the driver if defined.
+        (QCuser_spec): New symbol.
+        (font_spec_from_name): Save name as user-spec.
+        (font_load_for_lface): Keep user-spec instead of name.
+        (font_open_by_name): Save name as user-spec.
+        (syms_of_font): Initialize QCuser_spec.
+        (font_clear_prop): Clear name if it exists in font (bug#5157).
+
+        * xftfont.c (xftfont_open): Call xftfont_add_rendering_parameters.
+        (xftfont_add_rendering_parameters, xftfont_cached_font_ok): New.
+        (syms_of_xftfont): Initialize xftfont_driver.cached_font_ok.
+
+        * font.h (struct font_driver): Add cached_font_ok.
+
+        * xterm.c (x_clear_frame): Queue draw for scroll bars.
+
+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>
 
         * nsterm.m (ns_get_color): Fix buffer overflow (Bug#4763).
@@ -144,7 +207,7 @@
 2009-12-15  Michael Albinus  <michael.albinus@gmx.de>
 
         * dbusbind.c (xd_retrieve_arg): Reorder declarations in order to
-        avoid compiler warnings.  (Bug #5217).
+        avoid compiler warnings.  (Bug #5217)
 
 2009-12-14  Kenichi Handa  <handa@m17n.org>
 
@@ -5319,7 +5382,7 @@
         (XD_SIGNAL1, XD_SIGNAL2, XD_SIGNAL3): New macros.  Throw Qdbus_error.
         (xd_read_queued_messages): Catch Qdbus_error from the macros.
         (all): Replace xsignal1, xsignal2, xsignal3 by the respective
-        macro.  (Bug#1186).
+        macro.  (Bug#1186)
 
 2008-10-23  Ali Bahrami  <ali_gnu@emvision.com>  (tiny change)
 
@@ -21213,7 +21276,7 @@ See ChangeLog.10 for earlier changes.
 ;; add-log-time-zone-rule: t
 ;; End:
 
-    Copyright (C) 2007, 2008, 2009  Free Software Foundation, Inc.
+    Copyright (C) 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.