]> git.eshelyaron.com Git - emacs.git/commitdiff
Avoid rare assertion violations when deleting a frame
authorEli Zaretskii <eliz@gnu.org>
Mon, 10 Jun 2024 19:13:29 +0000 (22:13 +0300)
committerEshel Yaron <me@eshelyaron.com>
Wed, 12 Jun 2024 09:27:10 +0000 (11:27 +0200)
* src/dispnew.c (adjust_frame_glyphs): Allow nrows = 0 when
deleting a frame.  (Bug#71475)

(cherry picked from commit 7c97d05b56a90251cbe94099d211225b330449b1)

src/dispnew.c

index e74147f1456e5c6a2542d8691828ef3fb9cb5382..8bbb818bc19c3691b1871a81f56f27d692408537 100644 (file)
@@ -1851,6 +1851,7 @@ adjust_frame_glyphs (struct frame *f)
       eassert (FRAME_INITIAL_P (f)
               || noninteractive
               || !initialized
+              || !f->terminal->name /* frame is being deleted */
               || (f->current_matrix
                   && f->current_matrix->nrows > 0
                   && f->current_matrix->rows