Merge from trunk

diff --cc src/ChangeLog
index 795f72b21bd491fdef9d5eaa966205f5704922cb,08a02194ae66f5d6c38223b94c1fca82a0a4da94..b7ecf6b729716ea01dc9e86915e55f0276c5c6a3
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,20 -1,11 +1,26 @@@
+ 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>