# HG changeset patch # User Richard M. Stallman # Date 813431852 0 # Node ID dc0909e788bdddd8705b5573904a0fba1698eea1 # Parent 1a4cee562d3352dd5ac14dc76535463b423c0ce9 (redisplay_window, redisplay_window, display_text_line): Fix up calls to window_display_table. Access display tables as char-tables. diff -r 1a4cee562d33 -r dc0909e788bd src/xdisp.c --- a/src/xdisp.c Wed Oct 11 17:15:10 1995 +0000 +++ b/src/xdisp.c Wed Oct 11 17:17:32 1995 +0000 @@ -1368,7 +1368,7 @@ int opoint = PT; int tem; int update_mode_line; - struct Lisp_Vector *dp = window_display_table (w); + struct Lisp_Char_Table *dp = window_display_table (w); if (FRAME_HEIGHT (f) == 0) abort (); /* Some bug zeros some core */ @@ -1475,7 +1475,7 @@ changed, so why should we worry about doing any better? */ if (current_buffer->width_run_cache) { - struct Lisp_Vector *disptab = buffer_display_table (); + struct Lisp_Char_Table *disptab = buffer_display_table (); if (! disptab_matches_widthtab (disptab, XVECTOR (current_buffer->width_table))) @@ -2471,7 +2471,7 @@ ? 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); + 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 @@ -3979,12 +3979,11 @@ /* 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; + register struct Lisp_Char_Table *dp = 0; int i; - if (VECTORP (Vstandard_display_table) - && XVECTOR (Vstandard_display_table)->size == DISP_TABLE_SIZE) - dp = XVECTOR (Vstandard_display_table); + if (DISP_TABLE_P (Vstandard_display_table)) + dp = XCHAR_TABLE (Vstandard_display_table); if (tab_width <= 0 || tab_width > 1000) tab_width = 8; @@ -4290,7 +4289,7 @@ Vwindow_size_change_functions = Qnil; DEFVAR_LISP ("window-scroll-functions", &Vwindow_scroll_functions, - "Functions to call when a window is redisplayed with scrolling.\n\ + "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;