Mercurial > hg > xemacs-beta

comparison src/faces.c @ 62:28a7c63c7e1e r19-16-pre6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r19-16-pre6
author cvs
date Mon, 13 Aug 2007 08:59:13 +0200
parents 859a2309aef8
children 131b0175ea99
comparison
equal deleted inserted replaced
61:dd3566f69ebd 62:28a7c63c7e1e
1215 1215
1216 FROB (foreground); 1216 FROB (foreground);
1217 FROB (background); 1217 FROB (background);
1218 FROB (display_table); 1218 FROB (display_table);
1219 FROB (background_pixmap); 1219 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
1220 #undef FROB 1240 #undef FROB
1221 1241
1222 ensure_face_cachel_contains_charset (cachel, domain, Vcharset_ascii); 1242 ensure_face_cachel_contains_charset (cachel, domain, Vcharset_ascii);
1223 1243
1224 #define FROB(field) \ 1244 #define FROB(field) \