diff lisp/font.el @ 4370:b94710365f92

Automated merge with file:/Sources/xemacs-21.5-checked-out
author Aidan Kehoe <kehoea@parhasard.net>
date Sun, 30 Dec 2007 16:19:21 +0100
parents f5693b5f7f2d
children 29efd169efe7
line wrap: on
line diff
--- a/lisp/font.el	Sun Dec 30 16:18:33 2007 +0100
+++ b/lisp/font.el	Sun Dec 30 16:19:21 2007 +0100
@@ -813,7 +813,7 @@
 	 (pattern (fc-font-match device (fc-name-parse name)))
 	 (font-obj (make-font))
 	 (family (fc-pattern-get-family pattern 0))
-	 (size (fc-pattern-get-size pattern 0))
+	 (size (fc-pattern-get-or-compute-size pattern 0))
 	 (weight (fc-pattern-get-weight pattern 0)))
     (set-font-family font-obj 
 		     (and (not (equal family 'fc-result-no-match))