diff options
| author | Kim F. Storm <storm@cua.dk> | 2007-02-22 16:04:08 +0000 |
|---|---|---|
| committer | Kim F. Storm <storm@cua.dk> | 2007-02-22 16:04:08 +0000 |
| commit | a2130dbb79355fbafa71390d941d373a90d21a67 (patch) | |
| tree | 21e6d7666ade28a85e0bcb2c0b4d74eaae3cf4f1 /src/dispnew.c | |
| parent | d1eeefebd0c98f72a94121b31f789e3e9ba65703 (diff) | |
| download | emacs-a2130dbb79355fbafa71390d941d373a90d21a67.tar.gz | |
(update_frame, update_single_window): Set force_p here if
redisplay_dont_pause is set or Vredisplay_preemption_period is nil...
(update_window, update_frame_1): ... instead of here.
Diffstat (limited to 'src/dispnew.c')
| -rw-r--r-- | src/dispnew.c | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/src/dispnew.c b/src/dispnew.c index 172f07c663a..7841ffac76a 100644 --- a/src/dispnew.c +++ b/src/dispnew.c @@ -3827,8 +3827,12 @@ update_frame (f, force_p, inhibit_hairy_id_p) int paused_p; struct window *root_window = XWINDOW (f->root_window); + if (redisplay_dont_pause) + force_p = 1; #if PERIODIC_PREEMPTION_CHECKING - if (!force_p && NUMBERP (Vredisplay_preemption_period)) + else if (NILP (Vredisplay_preemption_period)) + force_p = 1; + else if (!force_p && NUMBERP (Vredisplay_preemption_period)) { EMACS_TIME tm; double p = XFLOATINT (Vredisplay_preemption_period); @@ -3982,8 +3986,12 @@ update_single_window (w, force_p) /* Record that this is not a frame-based redisplay. */ set_frame_matrix_frame (NULL); + if (redisplay_dont_pause) + force_p = 1; #if PERIODIC_PREEMPTION_CHECKING - if (!force_p && NUMBERP (Vredisplay_preemption_period)) + else if (NILP (Vredisplay_preemption_period)) + force_p = 1; + else if (!force_p && NUMBERP (Vredisplay_preemption_period)) { EMACS_TIME tm; double p = XFLOATINT (Vredisplay_preemption_period); @@ -4165,13 +4173,8 @@ update_window (w, force_p) #endif /* Check pending input the first time so that we can quickly return. */ - if (redisplay_dont_pause) - force_p = 1; -#if PERIODIC_PREEMPTION_CHECKING - else if (NILP (Vredisplay_preemption_period)) - force_p = 1; -#else - else if (!force_p) +#if !PERIODIC_PREEMPTION_CHECKING + if (!force_p) detect_input_pending_ignore_squeezables (); #endif @@ -5215,13 +5218,8 @@ update_frame_1 (f, force_p, inhibit_id_p) if (preempt_count <= 0) preempt_count = 1; - if (redisplay_dont_pause) - force_p = 1; -#if PERIODIC_PREEMPTION_CHECKING - else if (NILP (Vredisplay_preemption_period)) - force_p = 1; -#else - else if (!force_p && detect_input_pending_ignore_squeezables ()) +#if !PERIODIC_PREEMPTION_CHECKING + if (!force_p && detect_input_pending_ignore_squeezables ()) { pause = 1; goto do_pause; |