Mercurial > hg > xemacs-beta

comparison src/faces.c @ 195:a2f645c6b9f8 r20-3b24

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r20-3b24
author cvs
date Mon, 13 Aug 2007 09:59:05 +0200
parents 3d6bfa290dbd
children e45d5e7c476e
comparison
equal deleted inserted replaced
194:2947057885e5 195:a2f645c6b9f8
1183 1183
1184 FROB (foreground); 1184 FROB (foreground);
1185 FROB (background); 1185 FROB (background);
1186 FROB (display_table); 1186 FROB (display_table);
1187 FROB (background_pixmap); 1187 FROB (background_pixmap);
1188
1189 /*
1190 * A face's background pixmap will override the face's
1191 * background color. But the background pixmap of the
1192 * default face should not override the background color of
1193 * a face if the background color has been specified or
1194 * inherited.
1195 *
1196 * To accomplish this we remove the background pixmap of the
1197 * cachel and mark it as having been specified so that cachel
1198 * merging won't override it later.
1199 */
1200 if (! default_face
1201 && cachel->background_specified
1202 && ! cachel->background_pixmap_specified)
1203 {
1204 cachel->background_pixmap = Qunbound;
1205 cachel->background_pixmap_specified = 1;
1206 }
1207
1188 #undef FROB 1208 #undef FROB
1189 1209
1190 ensure_face_cachel_contains_charset (cachel, domain, Vcharset_ascii); 1210 ensure_face_cachel_contains_charset (cachel, domain, Vcharset_ascii);
1191 1211
1192 #define FROB(field) \ 1212 #define FROB(field) \