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

[Kim F. Storm]

Index: emacs/src/xdisp.c
diff -c emacs/src/xdisp.c:1.723 emacs/src/xdisp.c:1.724
*** emacs/src/xdisp.c:1.723     Sat Jan 26 18:02:00 2002
--- emacs/src/xdisp.c   Fri Feb  8 18:48:02 2002
***************
*** 895,901 ****
        if (ml_row && ml_row->mode_line_p)
        height -= ml_row->height;
        else
!       height -= estimate_mode_line_height (f, MODE_LINE_FACE_ID);
      }
  
    if (WINDOW_WANTS_HEADER_LINE_P (w))
--- 895,901 ----
        if (ml_row && ml_row->mode_line_p)
        height -= ml_row->height;
        else
!       height -= estimate_mode_line_height (f, CURRENT_MODE_LINE_FACE_ID (w));
      }
  
    if (WINDOW_WANTS_HEADER_LINE_P (w))
***************
*** 1078,1084 ****
      {
        if (WINDOW_WANTS_MODELINE_P (w))
        current_mode_line_height
!         = display_mode_line (w, MODE_LINE_FACE_ID,
                               current_buffer->mode_line_format);
    
        if (WINDOW_WANTS_HEADER_LINE_P (w))
--- 1078,1084 ----
      {
        if (WINDOW_WANTS_MODELINE_P (w))
        current_mode_line_height
!         = display_mode_line (w, CURRENT_MODE_LINE_FACE_ID (w),
                               current_buffer->mode_line_format);
    
        if (WINDOW_WANTS_HEADER_LINE_P (w))
***************
*** 1456,1468 ****
     will produce glyphs in that row.
  
     BASE_FACE_ID is the id of a base face to use.  It must be one of
!    DEFAULT_FACE_ID for normal text, MODE_LINE_FACE_ID or
!    HEADER_LINE_FACE_ID for displaying mode lines, or TOOL_BAR_FACE_ID for
!    displaying the tool-bar.
     
!    If ROW is null and BASE_FACE_ID is equal to MODE_LINE_FACE_ID or
!    HEADER_LINE_FACE_ID, the iterator will be initialized to use the
!    corresponding mode line glyph row of the desired matrix of W.  */
  
  void
  init_iterator (it, w, charpos, bytepos, row, base_face_id)
--- 1456,1469 ----
     will produce glyphs in that row.
  
     BASE_FACE_ID is the id of a base face to use.  It must be one of
!    DEFAULT_FACE_ID for normal text, MODE_LINE_FACE_ID,
!    MODE_LINE_INACTIVE_FACE_ID, or HEADER_LINE_FACE_ID for displaying
!    mode lines, or TOOL_BAR_FACE_ID for displaying the tool-bar.
     
!    If ROW is null and BASE_FACE_ID is equal to MODE_LINE_FACE_ID,
!    MODE_LINE_INACTIVE_FACE_ID, or HEADER_LINE_FACE_ID, the iterator
!    will be initialized to use the corresponding mode line glyph row of
!    the desired matrix of W.  */
  
  void
  init_iterator (it, w, charpos, bytepos, row, base_face_id)
***************
*** 1492,1498 ****
       appropriate.  */
    if (row == NULL)
      {
!       if (base_face_id == MODE_LINE_FACE_ID)
        row = MATRIX_MODE_LINE_ROW (w->desired_matrix);
        else if (base_face_id == HEADER_LINE_FACE_ID)
        row = MATRIX_HEADER_LINE_ROW (w->desired_matrix);
--- 1493,1500 ----
       appropriate.  */
    if (row == NULL)
      {
!       if (base_face_id == MODE_LINE_FACE_ID
!         || base_face_id == MODE_LINE_INACTIVE_FACE_ID)
        row = MATRIX_MODE_LINE_ROW (w->desired_matrix);
        else if (base_face_id == HEADER_LINE_FACE_ID)
        row = MATRIX_HEADER_LINE_ROW (w->desired_matrix);
***************
*** 2354,2360 ****
         use the mode line face instead of the frame's default face.  */
        if (it->glyph_row == MATRIX_MODE_LINE_ROW (it->w->desired_matrix)
          && new_face_id == DEFAULT_FACE_ID)
!       new_face_id = MODE_LINE_FACE_ID;
  #endif
        
        /* Is this a start of a run of characters with box?  Caveat:
--- 2356,2362 ----
         use the mode line face instead of the frame's default face.  */
        if (it->glyph_row == MATRIX_MODE_LINE_ROW (it->w->desired_matrix)
          && new_face_id == DEFAULT_FACE_ID)
!       new_face_id = CURRENT_MODE_LINE_FACE_ID (it->w);
  #endif
        
        /* Is this a start of a run of characters with box?  Caveat:
***************
*** 13431,13437 ****
  
    if (WINDOW_WANTS_MODELINE_P (w))
      {
!       display_mode_line (w, MODE_LINE_FACE_ID,
                         current_buffer->mode_line_format);
        ++n;
      }
--- 13433,13440 ----
  
    if (WINDOW_WANTS_MODELINE_P (w))
      {
!       /* Select mode line face based on the real selected window.  */
!       display_mode_line (w, CURRENT_MODE_LINE_FACE_ID (old_selected_window),
                         current_buffer->mode_line_format);
        ++n;
      }