comparison src/dispnew.c @ 83530:46b1096093f5

Merged from emacs@sv.gnu.org. Patches applied: * emacs@sv.gnu.org/emacs--devo--0--patch-294 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-295 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-296 Update from CVS: admin/FOR-RELEASE: Update refcard section. * emacs@sv.gnu.org/emacs--devo--0--patch-297 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-298 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-299 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-300 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-301 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-302 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-303 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-304 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-103 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-104 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-570
author Karoly Lorentey <lorentey@elte.hu>
date Mon, 12 Jun 2006 07:27:12 +0000
parents d9f8d2a65d18 623f01d9e470
children a387c138b28e
comparison
equal deleted inserted replaced
83529:0d9e16eab053 83530:46b1096093f5
340 340
341 static unsigned history_tick; 341 static unsigned history_tick;
342 342
343 static void add_frame_display_history P_ ((struct frame *, int)); 343 static void add_frame_display_history P_ ((struct frame *, int));
344 static void add_window_display_history P_ ((struct window *, char *, int)); 344 static void add_window_display_history P_ ((struct window *, char *, int));
345 345
346
347 /* Add to the redisplay history how window W has been displayed. 346 /* Add to the redisplay history how window W has been displayed.
348 MSG is a trace containing the information how W's glyph matrix 347 MSG is a trace containing the information how W's glyph matrix
349 has been constructed. PAUSED_P non-zero means that the update 348 has been constructed. PAUSED_P non-zero means that the update
350 has been interrupted for pending input. */ 349 has been interrupted for pending input. */
351 350
6435 sit_for (sec, usec, reading, display, initial_display) 6434 sit_for (sec, usec, reading, display, initial_display)
6436 int sec, usec, reading, display, initial_display; 6435 int sec, usec, reading, display, initial_display;
6437 { 6436 {
6438 swallow_events (display); 6437 swallow_events (display);
6439 6438
6440 if (detect_input_pending_run_timers (display) || !NILP (Vexecuting_kbd_macro)) 6439 if ((detect_input_pending_run_timers (display)
6440 && !redisplay_dont_pause)
6441 || !NILP (Vexecuting_kbd_macro))
6441 return Qnil; 6442 return Qnil;
6442 6443
6443 if (initial_display) 6444 if (initial_display)
6444 redisplay_preserve_echo_area (2); 6445 redisplay_preserve_echo_area (2);
6445 6446
6464 \(Not all operating systems support waiting for a fraction of a second.) 6465 \(Not all operating systems support waiting for a fraction of a second.)
6465 Optional arg NODISP non-nil means don't redisplay, just wait for input. 6466 Optional arg NODISP non-nil means don't redisplay, just wait for input.
6466 Redisplay is preempted as always if input arrives, and does not happen 6467 Redisplay is preempted as always if input arrives, and does not happen
6467 if input is available before it starts. 6468 if input is available before it starts.
6468 Value is t if waited the full time with no input arriving. 6469 Value is t if waited the full time with no input arriving.
6470
6471 Redisplay will occur even when input is available if you bind
6472 `redisplay-dont-pause' to a non-nil value.
6469 6473
6470 An obsolete but still supported form is 6474 An obsolete but still supported form is
6471 \(sit-for SECONDS &optional MILLISECONDS NODISP) 6475 \(sit-for SECONDS &optional MILLISECONDS NODISP)
6472 Where the optional arg MILLISECONDS specifies an additional wait period, 6476 Where the optional arg MILLISECONDS specifies an additional wait period,
6473 in milliseconds; this was useful when Emacs was built without 6477 in milliseconds; this was useful when Emacs was built without