Mercurial > hg > xemacs-beta
diff lisp/font.el @ 4408:8bbabcab2c42
Merge.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Sun, 20 Jan 2008 13:09:58 +0100 |
parents | f5693b5f7f2d |
children | 29efd169efe7 |
line wrap: on
line diff
--- a/lisp/font.el Wed Dec 26 17:30:16 2007 +0100 +++ b/lisp/font.el Sun Jan 20 13:09:58 2008 +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))