Mercurial > hg > xemacs-beta
diff src/faces.c @ 207:e45d5e7c476e r20-4b2
Import from CVS: tag r20-4b2
| author | cvs |
|---|---|
| date | Mon, 13 Aug 2007 10:03:52 +0200 |
| parents | a2f645c6b9f8 |
| children | 41ff10fd062f |
line wrap: on
line diff
--- a/src/faces.c Mon Aug 13 10:02:48 2007 +0200 +++ b/src/faces.c Mon Aug 13 10:03:52 2007 +0200 @@ -580,19 +580,20 @@ XFACE (face)->charsets_warned_about))) { #ifdef MULE - warn_when_safe - (Qfont, Qwarning, - "Unable to instantiate font for face %s, charset %s", - string_data (symbol_name - (XSYMBOL (XFACE (face)->name))), - string_data (symbol_name - (XSYMBOL (XCHARSET_NAME (charset))))); -#else - warn_when_safe (Qfont, Qwarning, - "Unable to instantiate font for face %s", - string_data (symbol_name - (XSYMBOL (XFACE (face)->name)))); + if (! UNBOUNDP (charset)) + warn_when_safe + (Qfont, Qwarning, + "Unable to instantiate font for face %s, charset %s", + string_data (symbol_name + (XSYMBOL (XFACE (face)->name))), + string_data (symbol_name + (XSYMBOL (XCHARSET_NAME (charset))))); + else #endif + warn_when_safe (Qfont, Qwarning, + "Unable to instantiate font for face %s", + string_data (symbol_name + (XSYMBOL (XFACE (face)->name)))); XFACE (face)->charsets_warned_about = Fcons (charset, XFACE (face)->charsets_warned_about); }