aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2015-10-01 20:21:28 +0300
committerEli Zaretskii2015-10-01 20:21:28 +0300
commit511a18ded332917b2df698be4d2c357eb2f270fd (patch)
tree065aaa7a070c2eb84de53e211786589be74e555b
parentc4c1fb97727ff52bcfa83ad5ed94a64a93d12e59 (diff)
downloademacs-511a18ded332917b2df698be4d2c357eb2f270fd.tar.gz
emacs-511a18ded332917b2df698be4d2c357eb2f270fd.zip
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)
-rw-r--r--src/xdisp.c6
1 files changed, 5 insertions, 1 deletions
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)
13388 13388
13389 inhibit_free_realized_faces = false; 13389 inhibit_free_realized_faces = false;
13390 13390
13391 consider_some_frames_p = false;
13392
13391 /* If face_change, init_iterator will free all realized faces, which 13393 /* If face_change, init_iterator will free all realized faces, which
13392 includes the faces referenced from current matrices. So, we 13394 includes the faces referenced from current matrices. So, we
13393 can't reuse current matrices in this case. */ 13395 can't reuse current matrices in this case. */
@@ -13762,7 +13764,9 @@ redisplay_internal (void)
13762 { 13764 {
13763 FOR_EACH_FRAME (tail, frame) 13765 FOR_EACH_FRAME (tail, frame)
13764 { 13766 {
13765 if (XFRAME (frame)->redisplay && XFRAME (frame) != sf) 13767 if (XFRAME (frame)->redisplay
13768 && XFRAME (frame) != sf
13769 && !FRAME_INITIAL_P (XFRAME (frame)))
13766 { 13770 {
13767 consider_some_frames_p = true; 13771 consider_some_frames_p = true;
13768 break; 13772 break;