Mercurial > hg > xemacs-beta
changeset 3802:d6f975442bd3
[xemacs-hg @ 2007-01-27 17:14:20 by michaels]
2007-01-27 Mike Sperber <mike@xemacs.org>
* faces.c (complex_vars_of_faces): Move declarations of fontptr
and fonts out of #ifdef MULE, unbreaking the non-MULE Xft build.
| author | michaels |
|---|---|
| date | Sat, 27 Jan 2007 17:14:22 +0000 |
| parents | b69bd495dfe2 |
| children | e51807f9eedd |
| files | src/ChangeLog src/faces.c |
| diffstat | 2 files changed, 8 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Fri Jan 26 22:51:07 2007 +0000 +++ b/src/ChangeLog Sat Jan 27 17:14:22 2007 +0000 @@ -1,3 +1,8 @@ +2007-01-27 Mike Sperber <mike@xemacs.org> + + * faces.c (complex_vars_of_faces): Move declarations of fontptr + and fonts out of #ifdef MULE, unbreaking the non-MULE Xft build. + 2007-01-20 Aidan Kehoe <kehoea@parhasard.net> * eval.c:
--- a/src/faces.c Fri Jan 26 22:51:07 2007 +0000 +++ b/src/faces.c Sat Jan 27 17:14:22 2007 +0000 @@ -2258,7 +2258,7 @@ Lisp_Object device_symbol = Qx; #endif -#ifdef MULE + const Ascbyte **fontptr; const Ascbyte *fonts[] = { @@ -2287,7 +2287,8 @@ "-*-*-medium-r-*-*-*-170-*-*-c-*-*-*", #endif }; - const Ascbyte **fontptr; + +#ifdef MULE /* Define some specifier tags for classes of character sets. Combining these allows for distinct fallback fonts for distinct dimensions of