[AC] More fixes about face indexes

Aidan Kehoe kehoea at parhasard.net
Wed Sep 26 10:14:44 EDT 2007


 Ar an séú lá is fiche de mí Méan Fómhair, scríobh Didier Verna: 

 > src/ChangeLog addition:
 > 
 > 2007-09-26  Didier Verna  <didier at xemacs.org>
 > 
 > 	More fixes similar to previous patch:
 > 
 > 	* faces.c (reset_face_cachels): Add informative comment about the
 > 	order of faces cache addition.

[...]

 > Index: src/faces.c
 > ===================================================================
 > RCS file: /pack/xemacscvs/XEmacs/xemacs/src/faces.c,v
 > retrieving revision 1.55
 > diff -u -u -t -b -B -w -r1.55 faces.c
 > --- src/faces.c	22 Apr 2007 19:58:59 -0000	1.55
 > +++ src/faces.c	26 Sep 2007 13:24:16 -0000
 > @@ -1592,6 +1592,10 @@
 >              Dynarr_free (cachel->merged_faces);
 >          }
 >        Dynarr_reset (w->face_cachels);
 > +      /* #### NOTE: be careful with the order !
 > +         The cpp macros DEFAULT_INDEX and MODELINE_INDEX defined in
 > +         redisplay.h depend on the code below, which is really clumsy.
 > +         -- dvl */

Assertions here would be more helpful than just the comment, IMO. In code:

	face_index fi;
	[...]
	fi = get_builtin_face_cache_index (w, Vdefault_face);
	ASSERT(DEFAULT_INDEX == fi);
	fi = get_builtin_face_cache_index (w, Vmodeline_face);
	ASSERT(MODELINE_INDEX == fi);

 >        get_builtin_face_cache_index (w, Vdefault_face);
 >        get_builtin_face_cache_index (w, Vmodeline_face);
 >        XFRAME (w->frame)->window_face_cache_reset = 1;

Otherwise, the changes are good and helpful. 

-- 
On the quay of the little Black Sea port, where the rescued pair came once
more into contact with civilization, Dobrinton was bitten by a dog which was
assumed to be mad, though it may only have been indiscriminating. (Saki)



More information about the XEmacs-Patches mailing list