Mercurial > hg > xemacs-beta

comparison src/frame.c @ 5587:3fde0e346ad7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
5586:d8a11d5ebc9f 5587:3fde0e346ad7
791 } 791 }
792 else 792 else
793 f->minibuffer_window = Qnil; 793 f->minibuffer_window = Qnil;
794 } 794 }
795 795
796 /* Make a frame containing only a minibuffer window. */ 796 /* Make a frame containing only a minibuffer window.
797 The minibuffer window is also the root window. */
797 798
798 static void 799 static void
799 setup_minibuffer_frame (struct frame *f) 800 setup_minibuffer_frame (struct frame *f)
800 { 801 {
801 /* This function can GC */ 802 /* This function can GC */
955 /* #### Do we need to be calling reset_face_cachels here, and then again 956 /* #### Do we need to be calling reset_face_cachels here, and then again
956 down below? */ 957 down below? */
957 if (initialized && !DEVICE_STREAM_P (d)) 958 if (initialized && !DEVICE_STREAM_P (d))
958 { 959 {
959 if (!NILP (f->minibuffer_window)) 960 if (!NILP (f->minibuffer_window))
960 reset_face_cachels (XWINDOW (f->minibuffer_window)); 961 {
962 reset_face_cachels (XWINDOW (f->minibuffer_window));
963 reset_glyph_cachels (XWINDOW (f->minibuffer_window));
964 }
961 reset_face_cachels (XWINDOW (f->root_window)); 965 reset_face_cachels (XWINDOW (f->root_window));
966 reset_glyph_cachels (XWINDOW (f->root_window));
962 } 967 }
963 968
964 /* If no frames on this device formerly existed, say this is the 969 /* If no frames on this device formerly existed, say this is the
965 first frame. It kind of assumes that frameless devices don't 970 first frame. It kind of assumes that frameless devices don't
966 exist, but it shouldn't be too harmful. */ 971 exist, but it shouldn't be too harmful. */