=== modified file 'src/dispnew.c'
*** old/src/dispnew.c	2010-03-16 14:48:29 +0000
--- new/src/dispnew.c	2010-03-16 16:06:28 +0000
***************
*** 5937,5942 ****
--- 5937,5943 ----
    Lisp_Object old_current_buffer = Fcurrent_buffer ();
    struct text_pos startp;
    Lisp_Object string;
+   int matrix_vpos;
    struct glyph_row *row;
  #ifdef HAVE_WINDOW_SYSTEM
    struct image *img = 0;
***************
*** 5974,5981 ****
      }
  #endif
  
!   if (it.vpos < w->current_matrix->nrows
!       && (row = MATRIX_ROW (w->current_matrix, it.vpos),
  	  row->enabled_p))
      {
        if (it.hpos < row->used[TEXT_AREA])
--- 5975,5984 ----
      }
  #endif
  
!   /* it.vpos isn't the same as MATRIX_ROW_VPOS if header line is displayed */
!   matrix_vpos = (w->current_matrix->rows->mode_line_p ? 1 : 0) + it.vpos;
!   if (matrix_vpos < w->current_matrix->nrows
!       && (row = MATRIX_ROW (w->current_matrix, matrix_vpos),
  	  row->enabled_p))
      {
        if (it.hpos < row->used[TEXT_AREA])