From: Gerd Moellmann <gerd@gnu.org>
Date: Mon, 18 Dec 2000 12:02:37 +0000 (+0000)
Subject: (init_iterator): If noninteractive, and the frame's
X-Git-Tag: emacs-pretest-21.0.95~441
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=62be99799b992f49e0fb9b952843dbc0e076d8e7;p=emacs.git

(init_iterator): If noninteractive, and the frame's
face cache is null, make one.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 882f3046815..8855068d4a2 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2000-12-18  Gerd Moellmann  <gerd@gnu.org>
 
+	* xdisp.c (init_iterator): If noninteractive, and the frame's
+	face cache is null, make one.
+
 	* xfns.c (show_busy_cursor): Check for live frames more
 	thoroughly.
 
diff --git a/src/xdisp.c b/src/xdisp.c
index 1a4493583c7..7fc606fed81 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -1446,7 +1446,11 @@ init_iterator (it, w, charpos, bytepos, row, base_face_id)
     }
 
   /* If realized faces have been removed, e.g. because of face
-     attribute changes of named faces, recompute them.  */
+     attribute changes of named faces, recompute them.  When running
+     in batch mode, the face cache of Vterminal_frame is null.  If
+     we happen to get called, make a dummy face cache.  */
+  if (noninteractive && FRAME_FACE_CACHE (it->f) == NULL)
+    init_frame_faces (it->f);
   if (FRAME_FACE_CACHE (it->f)->used == 0)
     recompute_basic_faces (it->f);