Mercurial > hg > xemacs-beta
diff src/frame.c @ 5587:3fde0e346ad7
Prevent assert at frame.c, l. 6311 by initializing glyph cachels.
* frame.c (Fmake_frame): Ensure that reset_glyph_cachels gets called.
(setup_minibuffer_frame): Improve header comment.
* redisplay.c (redisplay_window): Update comment.
Remove code checking for uninitialized face_cachels and glyph_cachels.
Can't happen in theory, and guarded by asserts in practice.
* window.c (allocate_window): Update comment on reset_*_cachels.
| author | Stephen J. Turnbull <stephen@xemacs.org> |
|---|---|
| date | Sat, 29 Oct 2011 00:35:33 +0900 |
| parents | 56144c8593a8 |
| children | 0f2338afbabf |
line wrap: on
line diff
--- a/src/frame.c Fri Oct 28 23:52:26 2011 +0900 +++ b/src/frame.c Sat Oct 29 00:35:33 2011 +0900 @@ -793,7 +793,8 @@ f->minibuffer_window = Qnil; } -/* Make a frame containing only a minibuffer window. */ +/* Make a frame containing only a minibuffer window. + The minibuffer window is also the root window. */ static void setup_minibuffer_frame (struct frame *f) @@ -957,8 +958,12 @@ if (initialized && !DEVICE_STREAM_P (d)) { if (!NILP (f->minibuffer_window)) - reset_face_cachels (XWINDOW (f->minibuffer_window)); + { + reset_face_cachels (XWINDOW (f->minibuffer_window)); + reset_glyph_cachels (XWINDOW (f->minibuffer_window)); + } reset_face_cachels (XWINDOW (f->root_window)); + reset_glyph_cachels (XWINDOW (f->root_window)); } /* If no frames on this device formerly existed, say this is the