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

[Richard M . Stallman]

Index: emacs/src/dispnew.c
diff -c emacs/src/dispnew.c:1.343 emacs/src/dispnew.c:1.344
*** emacs/src/dispnew.c:1.343   Thu Mar 17 23:39:12 2005
--- emacs/src/dispnew.c Sat Apr  9 23:51:18 2005
***************
*** 3165,3178 ****
                  int m2_from;
  
                  w2 = frame_row_to_window (root, frame_from);
!                 m2 = w2->current_matrix;
!                 m2_from = frame_from - m2->matrix_y;
!                 copy_row_except_pointers (m->rows + window_to,
!                                           m2->rows + m2_from);
! 
!                 /* If frame line is empty, window line is empty, too.  */
!                 if (!retained_p[copy_from[i]])
!                   m->rows[window_to].enabled_p = 0;
                  sync_p = 1;
                }
              else if (from_inside_window_p)
--- 3165,3184 ----
                  int m2_from;
  
                  w2 = frame_row_to_window (root, frame_from);
!                 /* address@hidden: when enabling menu bar using `emacs
!                    -nw', FROM_FRAME sometimes has no associated window.
!                    This check avoids a segfault if W2 is null.  */
!                 if (w2)
!                   {
!                     m2 = w2->current_matrix;
!                     m2_from = frame_from - m2->matrix_y;
!                     copy_row_except_pointers (m->rows + window_to,
!                                               m2->rows + m2_from);
! 
!                     /* If frame line is empty, window line is empty, too.  */
!                     if (!retained_p[copy_from[i]])
!                       m->rows[window_to].enabled_p = 0;
!                   }
                  sync_p = 1;
                }
              else if (from_inside_window_p)