Mercurial > hg > xemacs-beta
diff lisp/x-font-menu.el @ 3360:316fddbf58e2
[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 | 15fb91e3a115 |
| children | d8309294c81c |
line wrap: on
line diff
--- a/lisp/x-font-menu.el Mon Apr 24 21:51:11 2006 +0000 +++ b/lisp/x-font-menu.el Tue Apr 25 14:02:09 2006 +0000 @@ -35,7 +35,6 @@ (require 'font-menu) (when (featurep 'xft-fonts) - (require 'xft) (require 'fontconfig)) (globally-declare-boundp @@ -276,6 +275,7 @@ (x-font-menu-font-data-core face dcache)))) (defun x-font-menu-font-data-xft (face dcache name domain) + ;; DOMAIN is expected to be a device. (let* ((truename (font-instance-truename (face-font-instance face domain (if (featurep 'mule) 'ascii)))) @@ -284,7 +284,7 @@ (progn nil) (progn - (let* ((pattern (fc-font-real-pattern name domain)) + (let* ((pattern (fc-font-match domain (fc-name-parse name))) (family (and pattern (fc-pattern-get-family pattern 0)))) (if (fc-pattern-get-successp family)