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

[Kim F . Storm]

Index: emacs/src/xdisp.c
diff -c emacs/src/xdisp.c:1.896 emacs/src/xdisp.c:1.897
*** emacs/src/xdisp.c:1.896     Mon Jul 19 00:50:20 2004
--- emacs/src/xdisp.c   Wed Jul 21 21:09:43 2004
***************
*** 14462,14470 ****
    /* We always start displaying at hpos zero even if hscrolled.  */
    xassert (it->hpos == 0 && it->current_x == 0);
  
!   /* We must not display in a row that's not a text row.  */
!   xassert (MATRIX_ROW_VPOS (row, it->w->desired_matrix)
!          < it->w->desired_matrix->nrows);
  
    /* Is IT->w showing the region?  */
    it->w->region_showing = it->region_beg_charpos > 0 ? Qt : Qnil;
--- 14462,14474 ----
    /* We always start displaying at hpos zero even if hscrolled.  */
    xassert (it->hpos == 0 && it->current_x == 0);
  
!   if (MATRIX_ROW_VPOS (row, it->w->desired_matrix)
!       >= it->w->desired_matrix->nrows)
!     {
!       it->w->nrows_scale_factor++;
!       fonts_changed_p = 1;
!       return 0;
!     }
  
    /* Is IT->w showing the region?  */
    it->w->region_showing = it->region_beg_charpos > 0 ? Qt : Qnil;
***************
*** 18135,18140 ****
--- 18139,18149 ----
        glyph->font_type = FONT_TYPE_UNKNOWN;
        ++it->glyph_row->used[area];
      }
+   else if (!fonts_changed_p)
+     {
+       it->w->ncols_scale_factor++;
+       fonts_changed_p = 1;
+     }
  }
  
  /* Store one glyph for the composition IT->cmp_id in IT->glyph_row.
***************
*** 18172,18177 ****
--- 18181,18191 ----
        glyph->font_type = FONT_TYPE_UNKNOWN;
        ++it->glyph_row->used[area];
      }
+   else if (!fonts_changed_p)
+     {
+       it->w->ncols_scale_factor++;
+       fonts_changed_p = 1;
+     }
  }
  
  
***************
*** 18341,18346 ****
--- 18355,18365 ----
          glyph->font_type = FONT_TYPE_UNKNOWN;
          ++it->glyph_row->used[area];
        }
+       else if (!fonts_changed_p)
+       {
+         it->w->ncols_scale_factor++;
+         fonts_changed_p = 1;
+       }
      }
  }
  
***************
*** 18384,18389 ****
--- 18403,18413 ----
        glyph->font_type = FONT_TYPE_UNKNOWN;
        ++it->glyph_row->used[area];
      }
+   else if (!fonts_changed_p)
+     {
+       it->w->ncols_scale_factor++;
+       fonts_changed_p = 1;
+     }
  }