diff options
| author | Stefan Kangas <stefan@marxist.se> | 2022-06-05 06:30:25 +0200 |
|---|---|---|
| committer | Stefan Kangas <stefan@marxist.se> | 2022-06-05 06:30:25 +0200 |
| commit | d46e94f23fbbd522f2a017444b29f9f18203b4bc (patch) | |
| tree | 606ec60566bda5eebbdea6bc5aee835fcafdef2f /src | |
| parent | ddfb91c0a7e46f0332caf82237cabc736ddfd276 (diff) | |
| parent | 1b8719835a200a2be17da226e82030f691caba80 (diff) | |
Merge from origin/emacs-28
1b8719835a Update to Org 9.5.4
92c5faafd7 Clarify documentation of 'string-to-unibyte'
2848512654 ; * lisp/files.el (find-file): Avoid too short lines in do...
672f9f787f Improve keystrokes in doc strings in some find-file functions
ef5651cc77 Fix segfaults when starting on 80x26 TTY frames
bfa647972f ; Fix doc string of 'delete-selection-repeat-replace-region'
a95d46e00f Make it explicit that a couple of _s in lispref are unders...
5c74c25123 Remove from FAQ the MS-Windows info about BDF fonts
edb48646f2 Fix Display Property manual example
Diffstat (limited to 'src')
| -rw-r--r-- | src/dispnew.c | 26 |
1 files changed, 25 insertions, 1 deletions
diff --git a/src/dispnew.c b/src/dispnew.c index 795c928bc13..7a4d9f8710b 100644 --- a/src/dispnew.c +++ b/src/dispnew.c @@ -1837,7 +1837,18 @@ adjust_frame_glyphs (struct frame *f) if (FRAME_WINDOW_P (f)) adjust_frame_glyphs_for_window_redisplay (f); else - adjust_frame_glyphs_for_frame_redisplay (f); + { + adjust_frame_glyphs_for_frame_redisplay (f); + eassert (FRAME_INITIAL_P (f) + || noninteractive + || !initialized + || (f->current_matrix + && f->current_matrix->nrows > 0 + && f->current_matrix->rows + && f->desired_matrix + && f->desired_matrix->nrows > 0 + && f->desired_matrix->rows)); + } /* Don't forget the buffer for decode_mode_spec. */ adjust_decode_mode_spec_buffer (f); @@ -2119,6 +2130,19 @@ adjust_frame_glyphs_for_frame_redisplay (struct frame *f) SET_FRAME_GARBAGED (f); } } + else if (!FRAME_INITIAL_P (f) && !noninteractive && initialized) + { + if (!f->desired_matrix->nrows || !f->desired_matrix->rows) + { + adjust_glyph_matrix (NULL, f->desired_matrix, 0, 0, matrix_dim); + SET_FRAME_GARBAGED (f); + } + if (!f->current_matrix->nrows || !f->current_matrix->rows) + { + adjust_glyph_matrix (NULL, f->current_matrix, 0, 0, matrix_dim); + SET_FRAME_GARBAGED (f); + } + } } |