comparison src/faces.c @ 4667:cbe5d2169270

Fix typos in face.c.
author Stephen J. Turnbull <stephen@xemacs.org>
date Tue, 28 Jul 2009 23:23:47 +0900
parents f32c7f843961
children aa5ed11f473b
comparison
equal deleted inserted replaced
4666:4c1a8323aa9a 4667:cbe5d2169270
1169 1169
1170 bound = 0; 1170 bound = 0;
1171 /* Lookup the face again, this time allowing the fallback. If this 1171 /* Lookup the face again, this time allowing the fallback. If this
1172 succeeds, it'll give a font intended for the script in question, 1172 succeeds, it'll give a font intended for the script in question,
1173 which is preferable to translating to ISO10646-1 and using the 1173 which is preferable to translating to ISO10646-1 and using the
1174 fixed-width fallback. */ 1174 fixed-width fallback.
1175
1176 #### This is questionable. The problem is that unusual scripts
1177 will typically fallback to the hard-coded values as the user is
1178 unlikely to have specified them herself, a common complaint. */
1175 new_val = face_property_matching_instance (face, Qfont, 1179 new_val = face_property_matching_instance (face, Qfont,
1176 charset, domain, 1180 charset, domain,
1177 ERROR_ME_DEBUG_WARN, 0, 1181 ERROR_ME_DEBUG_WARN, 0,
1178 Qzero, 1182 Qzero,
1179 initial); 1183 initial);
1351 domain = wrap_window (w); 1355 domain = wrap_window (w);
1352 update_face_cachel_data (&new_cachel, domain, face); 1356 update_face_cachel_data (&new_cachel, domain, face);
1353 Dynarr_add (w->face_cachels, new_cachel); 1357 Dynarr_add (w->face_cachels, new_cachel);
1354 1358
1355 /* The face's background pixmap have not yet been frobbed (see comment 1359 /* The face's background pixmap have not yet been frobbed (see comment
1356 int update_face_cachel_data), so we have to do it now */ 1360 in update_face_cachel_data), so we have to do it now */
1357 if (must_finish_frobbing) 1361 if (must_finish_frobbing)
1358 { 1362 {
1359 int default_face = EQ (face, Vdefault_face); 1363 int default_face = EQ (face, Vdefault_face);
1360 struct face_cachel *cachel 1364 struct face_cachel *cachel
1361 = Dynarr_atp (w->face_cachels, Dynarr_length (w->face_cachels) - 1); 1365 = Dynarr_atp (w->face_cachels, Dynarr_length (w->face_cachels) - 1);
1392 the only one dealing with images. The problem we have here is that 1396 the only one dealing with images. The problem we have here is that
1393 frobbing the background pixmap might lead to image instantiation 1397 frobbing the background pixmap might lead to image instantiation
1394 which in turn might require that the cache we're building be up to 1398 which in turn might require that the cache we're building be up to
1395 date, hence a crash. Here's a typical scenario of this: 1399 date, hence a crash. Here's a typical scenario of this:
1396 1400
1397 - a new window is created and it's face cache elements are 1401 - a new window is created and its face cache elements are
1398 initialized through a call to reset_face_cachels[1]. At that point, 1402 initialized through a call to reset_face_cachels[1]. At that point,
1399 the cache for the default and modeline faces (normaly taken care of 1403 the cache for the default and modeline faces (normaly taken care of
1400 by redisplay itself) are null. 1404 by redisplay itself) are null.
1401 - the default face has a background pixmap which needs to be 1405 - the default face has a background pixmap which needs to be
1402 instantiated right here, as a consequence of cache initialization. 1406 instantiated right here, as a consequence of cache initialization.