[Emacs-diffs] Changes to emacs/src/xdisp.c

[Gerd Moellmann]

Index: emacs/src/xdisp.c
diff -c emacs/src/xdisp.c:1.746 emacs/src/xdisp.c:1.747
*** emacs/src/xdisp.c:1.746     Thu Apr  4 16:10:36 2002
--- emacs/src/xdisp.c   Fri Apr 12 07:42:23 2002
***************
*** 11343,11358 ****
  
    /* If W is a full-width window, glyph pointers in W's current matrix
       have, by definition, to be the same as glyph pointers in the
!      corresponding frame matrix.  */
    window_row = w->current_matrix->rows;
    window_row_end = window_row + w->current_matrix->nrows;
    frame_row = f->current_matrix->rows + XFASTINT (w->top);
    while (window_row < window_row_end)
      {
!       int area;
!       
!       for (area = LEFT_MARGIN_AREA; area <= LAST_AREA; ++area)
!       frame_row->glyphs[area] = window_row->glyphs[area];
  
        /* Disable frame rows whose corresponding window rows have
         been disabled in try_window_id.  */
--- 11343,11362 ----
  
    /* If W is a full-width window, glyph pointers in W's current matrix
       have, by definition, to be the same as glyph pointers in the
!      corresponding frame matrix.  Note that frame matrices have no
!      marginal areas (see build_frame_matrix).  */
    window_row = w->current_matrix->rows;
    window_row_end = window_row + w->current_matrix->nrows;
    frame_row = f->current_matrix->rows + XFASTINT (w->top);
    while (window_row < window_row_end)
      {
!       struct glyph *start = window_row->glyphs[LEFT_MARGIN_AREA];
!       struct glyph *end = window_row->glyphs[LAST_AREA];
! 
!       frame_row->glyphs[LEFT_MARGIN_AREA] = start;
!       frame_row->glyphs[TEXT_AREA] = start;
!       frame_row->glyphs[RIGHT_MARGIN_AREA] = end;
!       frame_row->glyphs[LAST_AREA] = end;
  
        /* Disable frame rows whose corresponding window rows have
         been disabled in try_window_id.  */
***************
*** 12367,12372 ****
--- 12371,12386 ----
  }
  
  
+ DEFUN ("dump-frame-glyph-matrix", Fdump_frame_glyph_matrix,
+        Sdump_frame_glyph_matrix, 0, 0, "", doc: /* */)
+      ()
+ {
+   struct frame *f = XFRAME (selected_frame);
+   dump_glyph_matrix (f->current_matrix, 1);
+   return Qnil;
+ }
+ 
+ 
  DEFUN ("dump-glyph-row", Fdump_glyph_row, Sdump_glyph_row, 1, 2, "",
         doc: /* Dump glyph row ROW to stderr.
  GLYPH 0 means don't dump glyphs.
***************
*** 14859,14864 ****
--- 14873,14879 ----
    staticpro (&message_dolog_marker3);
  
  #if GLYPH_DEBUG
+   defsubr (&Sdump_frame_glyph_matrix);
    defsubr (&Sdump_glyph_matrix);
    defsubr (&Sdump_glyph_row);
    defsubr (&Sdump_tool_bar_row);