Mercurial > hg > xemacs-beta

diff lisp/font.el @ 3360:316fddbf58e2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2006-04-25 14:01:52 by stephent] Repair broken commit to Xft code. <87aca9n4in.fsf@tleepslib.sk.tsukuba.ac.jp>
author stephent
date Tue, 25 Apr 2006 14:02:09 +0000
parents d97bc868eaaf
children a5e2d0f90f97
line wrap: on
line diff
--- a/lisp/font.el	Mon Apr 24 21:51:11 2006 +0000
+++ b/lisp/font.el	Tue Apr 25 14:02:09 2006 +0000
@@ -796,10 +796,12 @@
   "A list of font family mappings on Xft devices.")
 
 (defun xft-font-create-object (fontname &optional device)
-  "Return a font descriptor object for FONTNAME, appropriate for Xft."
+  "Return a font descriptor object for FONTNAME, appropriate for Xft.
+
+Optional DEVICE defaults to `default-x-device'."
   (let* ((name fontname)
 	 (device (or device (default-x-device)))
-	 (pattern (fc-font-real-pattern name device))
+	 (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))