comparison src/redisplay.c @ 458:c33ae14dd6d0 r21-2-44

Import from CVS: tag r21-2-44
author cvs
date Mon, 13 Aug 2007 11:42:25 +0200
parents 3078fd1074e8
children 0784d089fdc9
comparison
equal deleted inserted replaced
457:4b9290a33024 458:c33ae14dd6d0
298 static Bytecount_dynarr *formatted_string_extent_start_dynarr; 298 static Bytecount_dynarr *formatted_string_extent_start_dynarr;
299 static Bytecount_dynarr *formatted_string_extent_end_dynarr; 299 static Bytecount_dynarr *formatted_string_extent_end_dynarr;
300 300
301 301
302 /* #### probably temporary */ 302 /* #### probably temporary */
303 int cache_adjustment; 303 Fixnum cache_adjustment;
304 304
305 /* This holds a string representing the text corresponding to a single 305 /* This holds a string representing the text corresponding to a single
306 modeline % spec. */ 306 modeline % spec. */
307 static Bufbyte_dynarr *mode_spec_bufbyte_string; 307 static Bufbyte_dynarr *mode_spec_bufbyte_string;
308 308
313 313
314 /* We only allow max_preempts preemptions before we force a redisplay. */ 314 /* We only allow max_preempts preemptions before we force a redisplay. */
315 static int preemption_count; 315 static int preemption_count;
316 316
317 /* Minimum pixel height of clipped bottom display line. */ 317 /* Minimum pixel height of clipped bottom display line. */
318 int vertical_clip; 318 Fixnum vertical_clip;
319 319
320 /* Minimum visible pixel width of clipped glyphs at right margin. */ 320 /* Minimum visible pixel width of clipped glyphs at right margin. */
321 int horizontal_clip; 321 Fixnum horizontal_clip;
322 322
323 /* Nonzero means reading single-character input with prompt 323 /* Nonzero means reading single-character input with prompt
324 so put cursor on minibuffer after the prompt. */ 324 so put cursor on minibuffer after the prompt. */
325 int cursor_in_echo_area; 325 int cursor_in_echo_area;
326 Lisp_Object Qcursor_in_echo_area; 326 Lisp_Object Qcursor_in_echo_area;
423 423
424 Lisp_Object Vglobal_mode_string; 424 Lisp_Object Vglobal_mode_string;
425 425
426 /* The number of lines scroll a window by when point leaves the window; if 426 /* The number of lines scroll a window by when point leaves the window; if
427 it is <=0 then point is centered in the window */ 427 it is <=0 then point is centered in the window */
428 int scroll_step; 428 Fixnum scroll_step;
429 429
430 /* Scroll up to this many lines, to bring point back on screen. */ 430 /* Scroll up to this many lines, to bring point back on screen. */
431 int scroll_conservatively; 431 Fixnum scroll_conservatively;
432 432
433 /* Marker for where to display an arrow on top of the buffer text. */ 433 /* Marker for where to display an arrow on top of the buffer text. */
434 Lisp_Object Voverlay_arrow_position; 434 Lisp_Object Voverlay_arrow_position;
435 /* String to display for the arrow. */ 435 /* String to display for the arrow. */
436 Lisp_Object Voverlay_arrow_string; 436 Lisp_Object Voverlay_arrow_string;
449 Think about this for 19.14. */ 449 Think about this for 19.14. */
450 Lisp_Object Vpre_redisplay_hook, Vpost_redisplay_hook; 450 Lisp_Object Vpre_redisplay_hook, Vpost_redisplay_hook;
451 Lisp_Object Qpre_redisplay_hook, Qpost_redisplay_hook; 451 Lisp_Object Qpre_redisplay_hook, Qpost_redisplay_hook;
452 #endif /* INHIBIT_REDISPLAY_HOOKS */ 452 #endif /* INHIBIT_REDISPLAY_HOOKS */
453 453
454 static int last_display_warning_tick, display_warning_tick; 454 static Fixnum last_display_warning_tick;
455 static Fixnum display_warning_tick;
455 Lisp_Object Qdisplay_warning_buffer; 456 Lisp_Object Qdisplay_warning_buffer;
456 int inhibit_warning_display; 457 int inhibit_warning_display;
457 458
458 Lisp_Object Vleft_margin_width, Vright_margin_width; 459 Lisp_Object Vleft_margin_width, Vright_margin_width;
459 Lisp_Object Vminimum_line_ascent, Vminimum_line_descent; 460 Lisp_Object Vminimum_line_ascent, Vminimum_line_descent;