aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGerd Moellmann2000-12-18 12:02:37 +0000
committerGerd Moellmann2000-12-18 12:02:37 +0000
commit62be99799b992f49e0fb9b952843dbc0e076d8e7 (patch)
tree6de43a6282f0cc732ffef1622eebb926adc8403a /src
parent5f7a18903e92294a624a9ad34abdeb75cc2feace (diff)
downloademacs-62be99799b992f49e0fb9b952843dbc0e076d8e7.tar.gz
emacs-62be99799b992f49e0fb9b952843dbc0e076d8e7.zip
(init_iterator): If noninteractive, and the frame's
face cache is null, make one.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog3
-rw-r--r--src/xdisp.c6
2 files changed, 8 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 882f3046815..8855068d4a2 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
12000-12-18 Gerd Moellmann <gerd@gnu.org> 12000-12-18 Gerd Moellmann <gerd@gnu.org>
2 2
3 * xdisp.c (init_iterator): If noninteractive, and the frame's
4 face cache is null, make one.
5
3 * xfns.c (show_busy_cursor): Check for live frames more 6 * xfns.c (show_busy_cursor): Check for live frames more
4 thoroughly. 7 thoroughly.
5 8
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)
1446 } 1446 }
1447 1447
1448 /* If realized faces have been removed, e.g. because of face 1448 /* If realized faces have been removed, e.g. because of face
1449 attribute changes of named faces, recompute them. */ 1449 attribute changes of named faces, recompute them. When running
1450 in batch mode, the face cache of Vterminal_frame is null. If
1451 we happen to get called, make a dummy face cache. */
1452 if (noninteractive && FRAME_FACE_CACHE (it->f) == NULL)
1453 init_frame_faces (it->f);
1450 if (FRAME_FACE_CACHE (it->f)->used == 0) 1454 if (FRAME_FACE_CACHE (it->f)->used == 0)
1451 recompute_basic_faces (it->f); 1455 recompute_basic_faces (it->f);
1452 1456