diff lisp/ChangeLog @ 4365:c9ab656691c0

Automated merge with ssh://aidan-guest@hg.debian.org//hg/xemacs/xemacs
author Aidan Kehoe <kehoea@parhasard.net>
date Thu, 27 Dec 2007 13:22:26 +0100
parents 6a17ac5da3c4 f5693b5f7f2d
children 69e6352406f0
line wrap: on
line diff
--- a/lisp/ChangeLog	Thu Dec 27 13:21:05 2007 +0100
+++ b/lisp/ChangeLog	Thu Dec 27 13:22:26 2007 +0100
@@ -6,6 +6,14 @@
 	truncation-glyph, continuation-glyph, octal-escape-glyph,
 	control-arrow-glyph. 
 
+2007-12-23  Mike Sperber  <mike@xemacs.org>
+
+	* font.el (xft-font-create-object): Use
+	`fc-pattern-get-or-compute-size' instead of
+	`fc-pattern-get-size'.
+
+	* fontconfig.el (fc-pattern-get-or-compute-size): Add.
+
 2007-12-22  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	Factor out lists of operators specially treated by `make-autoload'.