Mercurial > hg > xemacs-beta
changeset 4210:65c3847d432c
[xemacs-hg @ 2007-10-03 21:31:10 by didierv]
Check noninteractive mode in reset_face_cachels assertions
| author | didierv |
|---|---|
| date | Wed, 03 Oct 2007 21:31:12 +0000 |
| parents | 3651e9c49476 |
| children | 784190816f58 |
| files | src/ChangeLog src/faces.c |
| diffstat | 2 files changed, 7 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Wed Oct 03 16:53:39 2007 +0000 +++ b/src/ChangeLog Wed Oct 03 21:31:12 2007 +0000 @@ -1,3 +1,8 @@ +2007-10-03 Didier Verna <didier@xemacs.org> + + * faces.c (reset_face_cachels): Check for noninteractive mode in + the assertions below, in which case the cache is unused. + 2007-10-03 Didier Verna <didier@xemacs.org> * faces.c (reset_face_cachels): Assert correct order of built-in
--- a/src/faces.c Wed Oct 03 16:53:39 2007 +0000 +++ b/src/faces.c Wed Oct 03 21:31:12 2007 +0000 @@ -1599,9 +1599,9 @@ correct values if you ever add new built-in faces here. -- dvl */ fi = get_builtin_face_cache_index (w, Vdefault_face); - assert (fi == DEFAULT_INDEX); + assert (noninteractive || fi == DEFAULT_INDEX); fi = get_builtin_face_cache_index (w, Vmodeline_face); - assert (fi == MODELINE_INDEX); + assert (noninteractive || fi == MODELINE_INDEX); XFRAME (w->frame)->window_face_cache_reset = 1; } }