Mercurial > hg > xemacs-beta
changeset 4766:32b358a240b0
Avoid calling Xft if not built in.
| author | Stephen J. Turnbull <stephen@xemacs.org> |
|---|---|
| date | Sat, 05 Dec 2009 01:02:33 +0900 |
| parents | 1257b938f03a |
| children | dba492ef7440 |
| files | lisp/ChangeLog lisp/font.el src/ChangeLog src/faces.c |
| diffstat | 4 files changed, 12 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Fri Dec 04 10:59:45 2009 +0900 +++ b/lisp/ChangeLog Sat Dec 05 01:02:33 2009 +0900 @@ -1,3 +1,7 @@ +2009-12-05 Stephen J. Turnbull <stephen@xemacs.org> + + * font.el (x-font-create-object): Check for Xft before using it. + 2009-11-10 Jerry James <james@xemacs.org> * device.el (device-type): Remove (mostly imaginary) support for
--- a/lisp/font.el Fri Dec 04 10:59:45 2009 +0900 +++ b/lisp/font.el Sat Dec 05 01:02:33 2009 +0900 @@ -569,6 +569,7 @@ (if (or (not (stringp fontname)) (not (string-match font-x-font-regexp fontname))) (if (and (stringp fontname) + (featurep 'xft-fonts) (string-match font-xft-font-regexp fontname)) ;; Return an XFT font. (xft-font-create-object fontname)
--- a/src/ChangeLog Fri Dec 04 10:59:45 2009 +0900 +++ b/src/ChangeLog Sat Dec 05 01:02:33 2009 +0900 @@ -1,3 +1,8 @@ +2009-12-05 Stephen J. Turnbull <stephen@xemacs.org> + + * faces.c (complex_vars_of_faces): Explain why "*" isn't rewritten + as a full XLFD. + 2009-11-19 Vin Shelton <acs@xemacs.org> * sysdep.c (sys_subshell): Restore sys_subshell(); it's necessary
--- a/src/faces.c Fri Dec 04 10:59:45 2009 +0900 +++ b/src/faces.c Sat Dec 05 01:02:33 2009 +0900 @@ -2342,6 +2342,8 @@ Fcons (Fcons (list1 (device_symbol), + /* grrr. This really does need to be "*", not an XLFD. + An unspecified XLFD won't pick up stuff like 10x20. */ build_string ("*")), inst_list); #ifdef MULE