diff options
| author | Gerd Möllmann | 2024-11-09 08:26:06 +0100 |
|---|---|---|
| committer | Gerd Möllmann | 2024-11-09 08:59:33 +0100 |
| commit | 8fa26765c0dcedcadf884195189e337cb9778cb8 (patch) | |
| tree | e44ccadaf5951ac81ec717facbbddc0212c84b6d /src | |
| parent | 6cd7ce7cf2a36a790c7e1e0a5496c35fc9d56495 (diff) | |
| download | emacs-8fa26765c0dcedcadf884195189e337cb9778cb8.tar.gz emacs-8fa26765c0dcedcadf884195189e337cb9778cb8.zip | |
Don't copy from non-enabled current glyphs (bug#74274)
* src/dispnew.c (prepare_desired_root_row): Check if current row is
enabled.
Diffstat (limited to 'src')
| -rw-r--r-- | src/dispnew.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/dispnew.c b/src/dispnew.c index b8bc9f73afa..260e7ef2d1d 100644 --- a/src/dispnew.c +++ b/src/dispnew.c | |||
| @@ -3520,9 +3520,12 @@ prepare_desired_root_row (struct frame *root, int y) | |||
| 3520 | if (!root_row->enabled_p) | 3520 | if (!root_row->enabled_p) |
| 3521 | { | 3521 | { |
| 3522 | struct glyph_row *from = MATRIX_ROW (root->current_matrix, y); | 3522 | struct glyph_row *from = MATRIX_ROW (root->current_matrix, y); |
| 3523 | memcpy (root_row->glyphs[0], from->glyphs[0], | 3523 | if (from->enabled_p) |
| 3524 | root->current_matrix->matrix_w * sizeof (struct glyph)); | 3524 | { |
| 3525 | root_row->enabled_p = true; | 3525 | memcpy (root_row->glyphs[0], from->glyphs[0], |
| 3526 | root->current_matrix->matrix_w * sizeof (struct glyph)); | ||
| 3527 | root_row->enabled_p = true; | ||
| 3528 | } | ||
| 3526 | } | 3529 | } |
| 3527 | return root_row; | 3530 | return root_row; |
| 3528 | } | 3531 | } |