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

[Miles Bader]

Index: emacs/src/xdisp.c
diff -c emacs/src/xdisp.c:1.843.2.16 emacs/src/xdisp.c:1.843.2.17
*** emacs/src/xdisp.c:1.843.2.16        Tue Jun 29 16:46:06 2004
--- emacs/src/xdisp.c   Fri Jul 23 04:30:44 2004
***************
*** 14562,14570 ****
    /* 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;
--- 14562,14574 ----
    /* 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;
***************
*** 18241,18246 ****
--- 18245,18255 ----
        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.
***************
*** 18278,18283 ****
--- 18287,18297 ----
        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;
+     }
  }
  
  
***************
*** 18447,18452 ****
--- 18461,18471 ----
          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;
+       }
      }
  }
  
***************
*** 18490,18495 ****
--- 18509,18519 ----
        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;
+     }
  }
  
  
***************
*** 22324,22330 ****
    Vwindow_size_change_functions = Qnil;
  
    DEFVAR_LISP ("window-scroll-functions", &Vwindow_scroll_functions,
!     doc: /* List of Functions to call before redisplaying a window with 
scrolling.
  Each function is called with two arguments, the window
  and its new display-start position.  Note that the value of `window-end'
  is not valid when these functions are called.  */);
--- 22348,22354 ----
    Vwindow_size_change_functions = Qnil;
  
    DEFVAR_LISP ("window-scroll-functions", &Vwindow_scroll_functions,
!     doc: /* List of functions to call before redisplaying a window with 
scrolling.
  Each function is called with two arguments, the window
  and its new display-start position.  Note that the value of `window-end'
  is not valid when these functions are called.  */);