comparison 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
comparison
equal deleted inserted replaced
206:d3e9274cbc4e 207:e45d5e7c476e
578 { 578 {
579 if (NILP (memq_no_quit (charset, 579 if (NILP (memq_no_quit (charset,
580 XFACE (face)->charsets_warned_about))) 580 XFACE (face)->charsets_warned_about)))
581 { 581 {
582 #ifdef MULE 582 #ifdef MULE
583 warn_when_safe 583 if (! UNBOUNDP (charset))
584 (Qfont, Qwarning, 584 warn_when_safe
585 "Unable to instantiate font for face %s, charset %s", 585 (Qfont, Qwarning,
586 string_data (symbol_name 586 "Unable to instantiate font for face %s, charset %s",
587 (XSYMBOL (XFACE (face)->name))), 587 string_data (symbol_name
588 string_data (symbol_name 588 (XSYMBOL (XFACE (face)->name))),
589 (XSYMBOL (XCHARSET_NAME (charset))))); 589 string_data (symbol_name
590 #else 590 (XSYMBOL (XCHARSET_NAME (charset)))));
591 warn_when_safe (Qfont, Qwarning, 591 else
592 "Unable to instantiate font for face %s",
593 string_data (symbol_name
594 (XSYMBOL (XFACE (face)->name))));
595 #endif 592 #endif
593 warn_when_safe (Qfont, Qwarning,
594 "Unable to instantiate font for face %s",
595 string_data (symbol_name
596 (XSYMBOL (XFACE (face)->name))));
596 XFACE (face)->charsets_warned_about = 597 XFACE (face)->charsets_warned_about =
597 Fcons (charset, XFACE (face)->charsets_warned_about); 598 Fcons (charset, XFACE (face)->charsets_warned_about);
598 } 599 }
599 retval = Vthe_null_font_instance; 600 retval = Vthe_null_font_instance;
600 } 601 }