From: Gerd Moellmann Date: Wed, 30 Aug 2000 15:00:17 +0000 (+0000) Subject: (update_frame): Only set display_completed here; use X-Git-Tag: emacs-pretest-21.0.90~1869 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=868dd24bb197a692d1c6eaf71a67fd385098c460;p=emacs.git (update_frame): Only set display_completed here; use the update_begin and update_end calls here from update_frame_1. (update_frame_1): Don't set display_completed here, don't call update_begin/update_end. --- diff --git a/src/ChangeLog b/src/ChangeLog index 4aeda60f2f1..2544112576b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,13 @@ 2000-08-30 Gerd Moellmann + * xdisp.c (echo_area_display): Check display_completed instead + of calling detect_input_pending. + + * dispnew.c (update_frame): Only set display_completed here; move + the update_begin and update_end calls here from update_frame_1. + (update_frame_1): Don't set display_completed here, don't call + update_begin/update_end. + * xfaces.c (set_font_frame_param): Use Fmodify_frame_parameters instead of store_frame_param. diff --git a/src/dispnew.c b/src/dispnew.c index e16296c717e..45b1223e55c 100644 --- a/src/dispnew.c +++ b/src/dispnew.c @@ -3560,10 +3560,9 @@ update_frame (f, force_p, inhibit_hairy_id_p) /* Update windows. */ paused_p = update_window_tree (root_window, force_p); update_end (f); - display_completed = !paused_p; - - /* The flush is a performance bottleneck under X. */ -#if 0 + +#if 0 /* This flush is a performance bottleneck under X, + and it doesn't seem to be necessary anyway. */ rif->flush_display (f); #endif } @@ -3573,21 +3572,26 @@ update_frame (f, force_p, inhibit_hairy_id_p) frame matrix we operate. */ set_frame_matrix_frame (f); - /* Build F's desired matrix from window matrices. For windows - whose must_be_updated_p flag is set, desired matrices are - made part of the desired frame matrix. For other windows, - the current matrix is copied. */ + /* Build F's desired matrix from window matrices. */ build_frame_matrix (f); - /* Do the update on the frame desired matrix. */ + /* Update the display */ + update_begin (f); paused_p = update_frame_1 (f, force_p, inhibit_hairy_id_p); - + update_end (f); + + if (termscript) + fflush (termscript); + fflush (stdout); + /* Check window matrices for lost pointers. */ IF_DEBUG (check_window_matrix_pointers (root_window)); } /* Reset flags indicating that a window should be updated. */ set_window_update_flags (root_window, 0); + + display_completed = !paused_p; return paused_p; } @@ -4718,8 +4722,6 @@ update_frame_1 (f, force_p, inhibit_id_p) goto do_pause; } - update_begin (f); - /* If we cannot insert/delete lines, it's no use trying it. */ if (!line_ins_del_ok) inhibit_id_p = 1; @@ -4875,15 +4877,8 @@ update_frame_1 (f, force_p, inhibit_id_p) } } - update_end (f); - - if (termscript) - fflush (termscript); - fflush (stdout); - do_pause: - display_completed = !pause; clear_desired_matrices (f); return pause; }