comparison src/xdisp.c @ 13188:dc0909e788bd

(redisplay_window, redisplay_window, display_text_line): Fix up calls to window_display_table. Access display tables as char-tables.

13187:1a4cee562d33

  register int hscroll = XINT (w->hscroll);
  struct position pos;
  int opoint = PT;
  int tem;
  int update_mode_line;
  struct Lisp_Vector *dp = window_display_table (w);

  if (FRAME_HEIGHT (f) == 0) abort (); /* Some bug zeros some core */

  /* If this is a combination window, do its children; that's all.  */

     may be a bit late to catch such changes, but the rest of
     redisplay goes (non-fatally) haywire when the display table is
     changed, so why should we worry about doing any better?  */
  if (current_buffer->width_run_cache)
    {
      struct Lisp_Vector *disptab = buffer_display_table ();

      if (! disptab_matches_widthtab (disptab,
                                      XVECTOR (current_buffer->width_table)))
        {
          invalidate_region_cache (current_buffer,

  int selective = (INTEGERP (current_buffer->selective_display)
		   ? XINT (current_buffer->selective_display)
		   : !NILP (current_buffer->selective_display) ? -1 : 0);
  register struct frame_glyphs *desired_glyphs = FRAME_DESIRED_GLYPHS (f);
  register struct Lisp_Vector *dp = window_display_table (w);

  Lisp_Object default_invis_vector[3];
  /* Number of characters of ellipsis to display after an invisible line
     if it calls for an ellipsis.
     Note that this value can be nonzero regardless of whether

  GLYPH *p1start = desired_glyphs->glyphs[vpos] + hpos;
  int window_width = XFASTINT (w->width);

  /* Use the standard display table, not the window's display table.
     We don't want the mode line in rot13.  */
  register struct Lisp_Vector *dp = 0;
  int i;

  if (VECTORP (Vstandard_display_table)
      && XVECTOR (Vstandard_display_table)->size == DISP_TABLE_SIZE)
    dp = XVECTOR (Vstandard_display_table);

  if (tab_width <= 0 || tab_width > 1000) tab_width = 8;

  p1 = p1start;
  start = desired_glyphs->glyphs[vpos] + XFASTINT (w->left);

size since the last redisplay, or have been split or deleted,\n\
all the functions in the list are called, with the frame as argument.");
  Vwindow_size_change_functions = Qnil;

  DEFVAR_LISP ("window-scroll-functions", &Vwindow_scroll_functions,
    "Functions to call when a window is redisplayed with scrolling.\n\
Each function is called with two arguments, the window\n\
and its new display-start position.");
  Vwindow_scroll_functions = Qnil;
}

13188:dc0909e788bd

  register int hscroll = XINT (w->hscroll);
  struct position pos;
  int opoint = PT;
  int tem;
  int update_mode_line;
  struct Lisp_Char_Table *dp = window_display_table (w);

  if (FRAME_HEIGHT (f) == 0) abort (); /* Some bug zeros some core */

  /* If this is a combination window, do its children; that's all.  */

     may be a bit late to catch such changes, but the rest of
     redisplay goes (non-fatally) haywire when the display table is
     changed, so why should we worry about doing any better?  */
  if (current_buffer->width_run_cache)
    {
      struct Lisp_Char_Table *disptab = buffer_display_table ();

      if (! disptab_matches_widthtab (disptab,
                                      XVECTOR (current_buffer->width_table)))
        {
          invalidate_region_cache (current_buffer,

  int selective = (INTEGERP (current_buffer->selective_display)
		   ? XINT (current_buffer->selective_display)
		   : !NILP (current_buffer->selective_display) ? -1 : 0);
  register struct frame_glyphs *desired_glyphs = FRAME_DESIRED_GLYPHS (f);
  register struct Lisp_Char_Table *dp = window_display_table (w);

  Lisp_Object default_invis_vector[3];
  /* Number of characters of ellipsis to display after an invisible line
     if it calls for an ellipsis.
     Note that this value can be nonzero regardless of whether

  GLYPH *p1start = desired_glyphs->glyphs[vpos] + hpos;
  int window_width = XFASTINT (w->width);

  /* Use the standard display table, not the window's display table.
     We don't want the mode line in rot13.  */
  register struct Lisp_Char_Table *dp = 0;
  int i;

  if (DISP_TABLE_P (Vstandard_display_table))
    dp = XCHAR_TABLE (Vstandard_display_table);

  if (tab_width <= 0 || tab_width > 1000) tab_width = 8;

  p1 = p1start;
  start = desired_glyphs->glyphs[vpos] + XFASTINT (w->left);

size since the last redisplay, or have been split or deleted,\n\
all the functions in the list are called, with the frame as argument.");
  Vwindow_size_change_functions = Qnil;

  DEFVAR_LISP ("window-scroll-functions", &Vwindow_scroll_functions,
    "List of Functions to call before redisplaying a window with scrolling.\n\
Each function is called with two arguments, the window\n\
and its new display-start position.");
  Vwindow_scroll_functions = Qnil;
}