diff options
| author | Stefan Monnier | 2010-03-31 00:14:08 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2010-03-31 00:14:08 -0400 |
| commit | 855a0da7fdb9c33761d7ba3ad6ab66a41bc2d1f3 (patch) | |
| tree | 7e136862fdaf8e885e1706be53e92914c8f27a0b /src/dispextern.h | |
| parent | dcf7843e7e1a857c21e39c2a5e53d27039a34a3a (diff) | |
| download | emacs-855a0da7fdb9c33761d7ba3ad6ab66a41bc2d1f3.tar.gz emacs-855a0da7fdb9c33761d7ba3ad6ab66a41bc2d1f3.zip | |
Get rid of the direct_output optimizations.
* keyboard.c (nonundocount): Remove extern declaration.
(command_loop_1): Remove brittle optimisation for cheap and common operations.
* xdisp.c (redisplay_internal): Don't bother checking
redisplay_performed_directly_p any more.
* sysdep.c (init_sys_modes): Don't call direct_output_forward_char any more.
* dispnew.c (redisplay_performed_directly_p)
(direct_output_for_insert, direct_output_forward_char):
* dispextern.h (redisplay_performed_directly_p)
(direct_output_for_insert, direct_output_forward_char): Remove.
* cmds.c (nonundocount): Make it static.
Diffstat (limited to 'src/dispextern.h')
| -rw-r--r-- | src/dispextern.h | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/src/dispextern.h b/src/dispextern.h index 5083199c529..b8f68ec0e70 100644 --- a/src/dispextern.h +++ b/src/dispextern.h | |||
| @@ -1102,17 +1102,9 @@ extern int cursor_in_echo_area; | |||
| 1102 | 1102 | ||
| 1103 | extern int display_completed; | 1103 | extern int display_completed; |
| 1104 | 1104 | ||
| 1105 | /* Non-zero means redisplay has been performed directly (see also | ||
| 1106 | direct_output_for_insert and direct_output_forward_char), so that | ||
| 1107 | no further updating has to be performed. The function | ||
| 1108 | redisplay_internal checks this flag, and does nothing but reset it | ||
| 1109 | to zero if it is non-zero. */ | ||
| 1110 | |||
| 1111 | extern int redisplay_performed_directly_p; | ||
| 1112 | |||
| 1113 | /* A temporary storage area, including a row of glyphs. Initialized | 1105 | /* A temporary storage area, including a row of glyphs. Initialized |
| 1114 | in xdisp.c. Used for various purposes, as an example see | 1106 | in xdisp.c. Used for various purposes, as an example see |
| 1115 | direct_output_for_insert. */ | 1107 | get_overlay_arrow_glyph_row. */ |
| 1116 | 1108 | ||
| 1117 | extern struct glyph_row scratch_glyph_row; | 1109 | extern struct glyph_row scratch_glyph_row; |
| 1118 | 1110 | ||
| @@ -3172,8 +3164,6 @@ extern void redraw_garbaged_frames P_ ((void)); | |||
| 3172 | extern void cancel_line P_ ((int, struct frame *)); | 3164 | extern void cancel_line P_ ((int, struct frame *)); |
| 3173 | extern void init_desired_glyphs P_ ((struct frame *)); | 3165 | extern void init_desired_glyphs P_ ((struct frame *)); |
| 3174 | extern int scroll_frame_lines P_ ((struct frame *, int, int, int, int)); | 3166 | extern int scroll_frame_lines P_ ((struct frame *, int, int, int, int)); |
| 3175 | extern int direct_output_for_insert P_ ((int)); | ||
| 3176 | extern int direct_output_forward_char P_ ((int)); | ||
| 3177 | extern int update_frame P_ ((struct frame *, int, int)); | 3167 | extern int update_frame P_ ((struct frame *, int, int)); |
| 3178 | extern int scrolling P_ ((struct frame *)); | 3168 | extern int scrolling P_ ((struct frame *)); |
| 3179 | extern void bitch_at_user P_ ((void)); | 3169 | extern void bitch_at_user P_ ((void)); |
| @@ -3200,8 +3190,6 @@ void set_window_update_flags P_ ((struct window *, int)); | |||
| 3200 | void redraw_frame P_ ((struct frame *)); | 3190 | void redraw_frame P_ ((struct frame *)); |
| 3201 | void redraw_garbaged_frames P_ ((void)); | 3191 | void redraw_garbaged_frames P_ ((void)); |
| 3202 | int scroll_cost P_ ((struct frame *, int, int, int)); | 3192 | int scroll_cost P_ ((struct frame *, int, int, int)); |
| 3203 | int direct_output_for_insert P_ ((int)); | ||
| 3204 | int direct_output_forward_char P_ ((int)); | ||
| 3205 | int update_frame P_ ((struct frame *, int, int)); | 3193 | int update_frame P_ ((struct frame *, int, int)); |
| 3206 | void update_single_window P_ ((struct window *, int)); | 3194 | void update_single_window P_ ((struct window *, int)); |
| 3207 | int scrolling P_ ((struct frame *)); | 3195 | int scrolling P_ ((struct frame *)); |