aboutsummaryrefslogtreecommitdiffstats
path: root/src/window.c
diff options
context:
space:
mode:
authorJoakim Verona2013-01-25 00:03:33 +0100
committerJoakim Verona2013-01-25 00:03:33 +0100
commit25520166464418c67a8b4ae9fb7174c949e40d6b (patch)
tree140513b5d8e79d0005f7fcda2aadb22a3ac4f210 /src/window.c
parente4963dc9795ed5a3eb60e73943b9d799107e0f13 (diff)
parent3d4147bae3f03502acb3d12a5c9747129cc0c6aa (diff)
downloademacs-25520166464418c67a8b4ae9fb7174c949e40d6b.tar.gz
emacs-25520166464418c67a8b4ae9fb7174c949e40d6b.zip
auto upstream
Diffstat (limited to 'src/window.c')
-rw-r--r--src/window.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/window.c b/src/window.c
index 906cfe6ba9d..f75c17a3d4f 100644
--- a/src/window.c
+++ b/src/window.c
@@ -2232,7 +2232,6 @@ candidate_window_p (Lisp_Object window, Lisp_Object owindow, Lisp_Object minibuf
2232 } 2232 }
2233 else if (EQ (all_frames, Qvisible)) 2233 else if (EQ (all_frames, Qvisible))
2234 { 2234 {
2235 FRAME_SAMPLE_VISIBILITY (f);
2236 candidate_p = FRAME_VISIBLE_P (f) 2235 candidate_p = FRAME_VISIBLE_P (f)
2237 && (FRAME_TERMINAL (XFRAME (w->frame)) 2236 && (FRAME_TERMINAL (XFRAME (w->frame))
2238 == FRAME_TERMINAL (XFRAME (selected_frame))); 2237 == FRAME_TERMINAL (XFRAME (selected_frame)));
@@ -2240,7 +2239,6 @@ candidate_window_p (Lisp_Object window, Lisp_Object owindow, Lisp_Object minibuf
2240 } 2239 }
2241 else if (INTEGERP (all_frames) && XINT (all_frames) == 0) 2240 else if (INTEGERP (all_frames) && XINT (all_frames) == 0)
2242 { 2241 {
2243 FRAME_SAMPLE_VISIBILITY (f);
2244 candidate_p = (FRAME_VISIBLE_P (f) || FRAME_ICONIFIED_P (f) 2242 candidate_p = (FRAME_VISIBLE_P (f) || FRAME_ICONIFIED_P (f)
2245#ifdef HAVE_X_WINDOWS 2243#ifdef HAVE_X_WINDOWS
2246 /* Yuck!! If we've just created the frame and the 2244 /* Yuck!! If we've just created the frame and the