From: Jan Djärv <jan.h.d@swipnet.se>
Date: Wed, 6 Jan 2010 19:42:27 +0000 (+0100)
Subject: Merge from trunk
X-Git-Tag: emacs-pretest-23.1.92~76
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=32d59dc3dbdc16c25f1f78659d3167c8f9670868;p=emacs.git

Merge from trunk
---

32d59dc3dbdc16c25f1f78659d3167c8f9670868
diff --cc src/ChangeLog
index 795f72b21bd,08a02194ae6..b7ecf6b7297
--- a/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>