(delete_window): Block input for the time window

matrices are being changed.

2 files changed, 17 insertions, 6 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 79f002fd600..2989c6a3a3e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+1999-12-07  Gerd Moellmann  <gerd@gnu.org>
+
+        * xfaces.c (x_set_menu_resources_from_menu_face): Make sure
+        basic faces are realized before trying to use face `menu'.
+
+        * window.c (delete_window): Block input for the time window
+        matrices are being changed.
+
 1999-12-07  Dave Love  <fx@gnu.org>
 
         * lread.c (Fintern_soft): Fix newlines in doc string.
@@ -26,12 +34,12 @@
 1999-12-06  Stefan Monnier  <monnier@cs.yale.edu>
 
         * editfns.c (Fdelete_and_extract_region): New function.
-        (syms_of_editfns): register it.
-        * insdel.c (del_range): update del_range_1 call.
+        (syms_of_editfns): Register it.
+        * insdel.c (del_range): Update del_range_1 call.
         (del_range_1, del_range_2): Add a ret_string argument to
         request that the deleted text be returned.
         (del_range_byte, del_range_both): Update del_range_2 call.
-        * lisp.h (del_range_1, del_range_2): change prototype
+        * lisp.h (del_range_1, del_range_2): Change prototype
         * casefiddle.c (casify_region): Update del_range_1 call.
         * coding.c (code_convert_region): Update del_range_2 call.
         * fileio.c (Finsert_file_contents): Update del_range_2 call.
diff --git a/src/window.c b/src/window.c
index dc01b2faedf..0d7cc27b39d 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1053,9 +1053,11 @@ delete_window (window)
       unchain_marker (p->start);
     }
 
-  /* Free window glyph matrices.
-     It is sure that they are allocated again when ADJUST_GLYPHS
-     is called. */
+  /* Free window glyph matrices.  It is sure that they are allocated
+     again when ADJUST_GLYPHS is called.  Block input so that expose
+     events and other events that access glyph matrices are not
+     processed while we are changing them.  */
+  BLOCK_INPUT;
   free_window_matrices (XWINDOW (FRAME_ROOT_WINDOW (frame)));
 
   tem = p->next;
@@ -1114,6 +1116,7 @@ delete_window (window)
 
   /* Adjust glyph matrices. */
   adjust_glyphs (frame);
+  UNBLOCK_INPUT;
 }