From: Eli Zaretskii Date: Thu, 1 Oct 2015 17:21:28 +0000 (+0300) Subject: Fix slow redisplay when daemon frame exists X-Git-Tag: emacs-25.0.90~1223^2~36 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=511a18ded332917b2df698be4d2c357eb2f270fd;p=emacs.git Fix slow redisplay when daemon frame exists * src/xdisp.c (redisplay_internal): Don't consider daemon frames when looking for frames that need to be redisplayed. (Bug#21597) --- diff --git a/src/xdisp.c b/src/xdisp.c index a2a6a81d4ec..ce27af2e67b 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -13388,6 +13388,8 @@ redisplay_internal (void) inhibit_free_realized_faces = false; + consider_some_frames_p = false; + /* If face_change, init_iterator will free all realized faces, which includes the faces referenced from current matrices. So, we can't reuse current matrices in this case. */ @@ -13762,7 +13764,9 @@ redisplay_internal (void) { FOR_EACH_FRAME (tail, frame) { - if (XFRAME (frame)->redisplay && XFRAME (frame) != sf) + if (XFRAME (frame)->redisplay + && XFRAME (frame) != sf + && !FRAME_INITIAL_P (XFRAME (frame))) { consider_some_frames_p = true; break;