/[emacs]/emacs/src/xdisp.c
ViewVC logotype

Diff of /emacs/src/xdisp.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.754.2.25 by miles, Tue Jul 6 10:20:31 2004 UTC revision 1.754.2.26 by miles, Fri Jul 23 04:42:23 2004 UTC
# Line 14462  display_line (it) Line 14462  display_line (it)
14462    /* We always start displaying at hpos zero even if hscrolled.  */    /* We always start displaying at hpos zero even if hscrolled.  */
14463    xassert (it->hpos == 0 && it->current_x == 0);    xassert (it->hpos == 0 && it->current_x == 0);
14464    
14465    /* We must not display in a row that's not a text row.  */    if (MATRIX_ROW_VPOS (row, it->w->desired_matrix)
14466    xassert (MATRIX_ROW_VPOS (row, it->w->desired_matrix)        >= it->w->desired_matrix->nrows)
14467             < it->w->desired_matrix->nrows);      {
14468          it->w->nrows_scale_factor++;
14469          fonts_changed_p = 1;
14470          return 0;
14471        }
14472    
14473    /* Is IT->w showing the region?  */    /* Is IT->w showing the region?  */
14474    it->w->region_showing = it->region_beg_charpos > 0 ? Qt : Qnil;    it->w->region_showing = it->region_beg_charpos > 0 ? Qt : Qnil;
# Line 18135  append_glyph (it) Line 18139  append_glyph (it)
18139        glyph->font_type = FONT_TYPE_UNKNOWN;        glyph->font_type = FONT_TYPE_UNKNOWN;
18140        ++it->glyph_row->used[area];        ++it->glyph_row->used[area];
18141      }      }
18142      else if (!fonts_changed_p)
18143        {
18144          it->w->ncols_scale_factor++;
18145          fonts_changed_p = 1;
18146        }
18147  }  }
18148    
18149  /* Store one glyph for the composition IT->cmp_id in IT->glyph_row.  /* Store one glyph for the composition IT->cmp_id in IT->glyph_row.
# Line 18172  append_composite_glyph (it) Line 18181  append_composite_glyph (it)
18181        glyph->font_type = FONT_TYPE_UNKNOWN;        glyph->font_type = FONT_TYPE_UNKNOWN;
18182        ++it->glyph_row->used[area];        ++it->glyph_row->used[area];
18183      }      }
18184      else if (!fonts_changed_p)
18185        {
18186          it->w->ncols_scale_factor++;
18187          fonts_changed_p = 1;
18188        }
18189  }  }
18190    
18191    
# Line 18341  produce_image_glyph (it) Line 18355  produce_image_glyph (it)
18355            glyph->font_type = FONT_TYPE_UNKNOWN;            glyph->font_type = FONT_TYPE_UNKNOWN;
18356            ++it->glyph_row->used[area];            ++it->glyph_row->used[area];
18357          }          }
18358          else if (!fonts_changed_p)
18359            {
18360              it->w->ncols_scale_factor++;
18361              fonts_changed_p = 1;
18362            }
18363      }      }
18364  }  }
18365    
# Line 18384  append_stretch_glyph (it, object, width, Line 18403  append_stretch_glyph (it, object, width,
18403        glyph->font_type = FONT_TYPE_UNKNOWN;        glyph->font_type = FONT_TYPE_UNKNOWN;
18404        ++it->glyph_row->used[area];        ++it->glyph_row->used[area];
18405      }      }
18406      else if (!fonts_changed_p)
18407        {
18408          it->w->ncols_scale_factor++;
18409          fonts_changed_p = 1;
18410        }
18411  }  }
18412    
18413    
# Line 22178  all the functions in the list are called Line 22202  all the functions in the list are called
22202    Vwindow_size_change_functions = Qnil;    Vwindow_size_change_functions = Qnil;
22203    
22204    DEFVAR_LISP ("window-scroll-functions", &Vwindow_scroll_functions,    DEFVAR_LISP ("window-scroll-functions", &Vwindow_scroll_functions,
22205      doc: /* List of Functions to call before redisplaying a window with scrolling.      doc: /* List of functions to call before redisplaying a window with scrolling.
22206  Each function is called with two arguments, the window  Each function is called with two arguments, the window
22207  and its new display-start position.  Note that the value of `window-end'  and its new display-start position.  Note that the value of `window-end'
22208  is not valid when these functions are called.  */);  is not valid when these functions are called.  */);

Legend:
Removed from v.1.754.2.25  
changed lines
  Added in v.1.754.2.26

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26