/[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.843.2.16 by miles, Tue Jun 29 16:46:06 2004 UTC revision 1.843.2.17 by miles, Fri Jul 23 04:30:44 2004 UTC
# Line 14562  display_line (it) Line 14562  display_line (it)
14562    /* We always start displaying at hpos zero even if hscrolled.  */    /* We always start displaying at hpos zero even if hscrolled.  */
14563    xassert (it->hpos == 0 && it->current_x == 0);    xassert (it->hpos == 0 && it->current_x == 0);
14564    
14565    /* We must not display in a row that's not a text row.  */    if (MATRIX_ROW_VPOS (row, it->w->desired_matrix)
14566    xassert (MATRIX_ROW_VPOS (row, it->w->desired_matrix)        >= it->w->desired_matrix->nrows)
14567             < it->w->desired_matrix->nrows);      {
14568          it->w->nrows_scale_factor++;
14569          fonts_changed_p = 1;
14570          return 0;
14571        }
14572    
14573    /* Is IT->w showing the region?  */    /* Is IT->w showing the region?  */
14574    it->w->region_showing = it->region_beg_charpos > 0 ? Qt : Qnil;    it->w->region_showing = it->region_beg_charpos > 0 ? Qt : Qnil;
# Line 18241  append_glyph (it) Line 18245  append_glyph (it)
18245        glyph->font_type = FONT_TYPE_UNKNOWN;        glyph->font_type = FONT_TYPE_UNKNOWN;
18246        ++it->glyph_row->used[area];        ++it->glyph_row->used[area];
18247      }      }
18248      else if (!fonts_changed_p)
18249        {
18250          it->w->ncols_scale_factor++;
18251          fonts_changed_p = 1;
18252        }
18253  }  }
18254    
18255  /* 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 18278  append_composite_glyph (it) Line 18287  append_composite_glyph (it)
18287        glyph->font_type = FONT_TYPE_UNKNOWN;        glyph->font_type = FONT_TYPE_UNKNOWN;
18288        ++it->glyph_row->used[area];        ++it->glyph_row->used[area];
18289      }      }
18290      else if (!fonts_changed_p)
18291        {
18292          it->w->ncols_scale_factor++;
18293          fonts_changed_p = 1;
18294        }
18295  }  }
18296    
18297    
# Line 18447  produce_image_glyph (it) Line 18461  produce_image_glyph (it)
18461            glyph->font_type = FONT_TYPE_UNKNOWN;            glyph->font_type = FONT_TYPE_UNKNOWN;
18462            ++it->glyph_row->used[area];            ++it->glyph_row->used[area];
18463          }          }
18464          else if (!fonts_changed_p)
18465            {
18466              it->w->ncols_scale_factor++;
18467              fonts_changed_p = 1;
18468            }
18469      }      }
18470  }  }
18471    
# Line 18490  append_stretch_glyph (it, object, width, Line 18509  append_stretch_glyph (it, object, width,
18509        glyph->font_type = FONT_TYPE_UNKNOWN;        glyph->font_type = FONT_TYPE_UNKNOWN;
18510        ++it->glyph_row->used[area];        ++it->glyph_row->used[area];
18511      }      }
18512      else if (!fonts_changed_p)
18513        {
18514          it->w->ncols_scale_factor++;
18515          fonts_changed_p = 1;
18516        }
18517  }  }
18518    
18519    
# Line 22324  all the functions in the list are called Line 22348  all the functions in the list are called
22348    Vwindow_size_change_functions = Qnil;    Vwindow_size_change_functions = Qnil;
22349    
22350    DEFVAR_LISP ("window-scroll-functions", &Vwindow_scroll_functions,    DEFVAR_LISP ("window-scroll-functions", &Vwindow_scroll_functions,
22351      doc: /* List of Functions to call before redisplaying a window with scrolling.      doc: /* List of functions to call before redisplaying a window with scrolling.
22352  Each function is called with two arguments, the window  Each function is called with two arguments, the window
22353  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'
22354  is not valid when these functions are called.  */);  is not valid when these functions are called.  */);

Legend:
Removed from v.1.843.2.16  
changed lines
  Added in v.1.843.2.17

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