Mercurial > emacs
diff src/macgui.h @ 90147:e1fbb019c538
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-39
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 258-271)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 66)
- Update from CVS
author | Miles Bader <miles@gnu.org> |
---|---|
date | Thu, 21 Apr 2005 05:59:53 +0000 |
parents | 30ad2795fdab 8af99087c1e5 |
children | 08185296b491 |
line wrap: on
line diff
--- a/src/macgui.h Thu Apr 21 05:57:27 2005 +0000 +++ b/src/macgui.h Thu Apr 21 05:59:53 2005 +0000 @@ -101,12 +101,16 @@ (xcs).descent = (bds).bottom) struct MacFontStruct { - char *fontname; + char *full_name; short mac_fontnum; /* font number of font used in this window */ int mac_fontsize; /* size of font */ short mac_fontface; /* plain, bold, italics, etc. */ +#if TARGET_API_MAC_CARBON + int mac_scriptcode; /* Mac OS script code for font used */ +#else short mac_scriptcode; /* Mac OS script code for font used */ +#endif #if 0 SInt16 mFontNum; /* font number of font used in this window */