Mercurial > emacs
changeset 25241:35674d7c4136
(mirror_make_current): If desired row isn't enabled,
just swap glyphs pointers between current and desired row.
(build_frame_matrix_from_leaf_window) [GLYPH_DEBUG]: Copy
desired matrix method string to current matrix.
| author | Gerd Moellmann <gerd@gnu.org> |
|---|---|
| date | Wed, 11 Aug 1999 10:47:38 +0000 |
| parents | 8f2a0f42229b |
| children | 28067247ff90 |
| files | src/dispnew.c |
| diffstat | 1 files changed, 9 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/dispnew.c Tue Aug 10 19:35:47 1999 +0000 +++ b/src/dispnew.c Wed Aug 11 10:47:38 1999 +0000 @@ -2467,6 +2467,10 @@ /* If rows are in sync, we don't have to copy glyphs because frame and window share glyphs. */ + +#if GLYPH_DEBUG + strcpy (w->current_matrix->method, w->desired_matrix->method); +#endif } /* Set number of used glyphs in the frame matrix. Since we fill @@ -2628,8 +2632,11 @@ = MATRIX_ROW (w->current_matrix, row); struct glyph_row *desired_row = MATRIX_ROW (w->desired_matrix, row); - - assign_row (current_row, desired_row); + + if (desired_row->enabled_p) + assign_row (current_row, desired_row); + else + swap_glyph_pointers (desired_row, current_row); current_row->enabled_p = 1; } }