Mercurial > hg > xemacs-beta

comparison src/faces.c @ 70:131b0175ea99 r20-0b30

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r20-0b30
author cvs
date Mon, 13 Aug 2007 09:02:59 +0200
parents 28a7c63c7e1e
children 9f59509498e1
comparison
equal deleted inserted replaced
69:804d1389bcd6 70:131b0175ea99
614 if (EQ (property, Qfont)) 614 if (EQ (property, Qfont))
615 { 615 {
616 if (NILP (memq_no_quit (charset, 616 if (NILP (memq_no_quit (charset,
617 XFACE (face)->charsets_warned_about))) 617 XFACE (face)->charsets_warned_about)))
618 { 618 {
619 #ifdef MULE
620 warn_when_safe
621 (Qfont, Qwarning,
622 "Unable to instantiate font for face %s, charset %s",
623 string_data (symbol_name
624 (XSYMBOL (XFACE (face)->name))),
625 string_data (symbol_name
626 (XSYMBOL (XCHARSET_NAME (charset)))));
627 #else
619 warn_when_safe (Qfont, Qwarning, 628 warn_when_safe (Qfont, Qwarning,
620 "Unable to instantiate font for face %s", 629 "Unable to instantiate font for face %s",
621 string_data (symbol_name 630 string_data (symbol_name
622 (XSYMBOL (XFACE (face)->name)))); 631 (XSYMBOL (XFACE (face)->name))));
632 #endif
623 XFACE (face)->charsets_warned_about = 633 XFACE (face)->charsets_warned_about =
624 Fcons (charset, XFACE (face)->charsets_warned_about); 634 Fcons (charset, XFACE (face)->charsets_warned_about);
625 } 635 }
626 retval = Vthe_null_font_instance; 636 retval = Vthe_null_font_instance;
627 } 637 }
1215 1225
1216 FROB (foreground); 1226 FROB (foreground);
1217 FROB (background); 1227 FROB (background);
1218 FROB (display_table); 1228 FROB (display_table);
1219 FROB (background_pixmap); 1229 FROB (background_pixmap);
1220
1221 /*
1222 * A face's background pixmap will override the face's
1223 * background color. But the background pixmap of the
1224 * default face should not override the background color of
1225 * a face if the background color has been specified or
1226 * inherited.
1227 *
1228 * To accomplish this we remove the background pixmap of the
1229 * cachel and mark it as having been specified so that cachel
1230 * merging won't override it later.
1231 */
1232 if (! default_face
1233 && cachel->background_specified
1234 && ! cachel->background_pixmap_specified)
1235 {
1236 cachel->background_pixmap = Qunbound;
1237 cachel->background_pixmap_specified = 1;
1238 }
1239
1240 #undef FROB 1230 #undef FROB
1241 1231
1242 ensure_face_cachel_contains_charset (cachel, domain, Vcharset_ascii); 1232 ensure_face_cachel_contains_charset (cachel, domain, Vcharset_ascii);
1243 1233
1244 #define FROB(field) \ 1234 #define FROB(field) \