CVS update by didierv xemacs/src ...

[xemacs-cvs at xemacs.org]

  User: didierv 
  Date: 07/10/03 23:31:15

  Modified:    xemacs/src ChangeLog faces.c
Log:
Check noninteractive mode in reset_face_cachels assertions

Revision  Changes    Path
1.1102    +5 -0      XEmacs/xemacs/src/ChangeLog

Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v
retrieving revision 1.1101
retrieving revision 1.1102
diff -u -p -r1.1101 -r1.1102
--- ChangeLog	2007/10/03 13:28:19	1.1101
+++ ChangeLog	2007/10/03 21:31:10	1.1102
@@ -1,5 +1,10 @@
 2007-10-03  Didier Verna  <didier at 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 at xemacs.org>
+
 	* faces.c (reset_face_cachels): Assert correct order of built-in
 	faces additions to the face cache, as per suggestion from Aidan.
 



1.58      +2 -2      XEmacs/xemacs/src/faces.c

Index: faces.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/faces.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- faces.c	2007/10/03 13:28:21	1.57
+++ faces.c	2007/10/03 21:31:12	1.58
@@ -1599,9 +1599,9 @@ reset_face_cachels (struct window *w)
 	 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;
     }
 }