(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.

1 files changed, 9 insertions, 2 deletions

diff --git a/src/dispnew.c b/src/dispnew.c
index 4875f736b99..07eccf05fb4 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -2467,6 +2467,10 @@ build_frame_matrix_from_leaf_window (frame_matrix, w)
 
           /* 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 @@ mirror_make_current (w, frame_row)
                 = 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;
             }
         }