summaryrefslogtreecommitdiff
path: root/src/xdisp.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/xdisp.c')
-rw-r--r--src/xdisp.c14
1 files changed, 1 insertions, 13 deletions
diff --git a/src/xdisp.c b/src/xdisp.c
index 94ce1c29a0c..0c3754a338f 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -32266,14 +32266,7 @@ expose_window_tree (struct window *w, XRectangle *r)
struct frame *f = XFRAME (w->frame);
bool mouse_face_overwritten_p = false;
- /* NS toolkits may have aleady modified the frame in expectation of
- a successful redraw, so don't bail out here if the frame is
- garbaged. */
- while (w
-#if !defined (HAVE_NS)
- && !FRAME_GARBAGED_P (f)
-#endif
- )
+ while (w && !FRAME_GARBAGED_P (f))
{
mouse_face_overwritten_p
|= (WINDOWP (w->contents)
@@ -32301,16 +32294,11 @@ expose_frame (struct frame *f, int x, int y, int w, int h)
TRACE ((stderr, "expose_frame "));
-#if !defined (HAVE_NS)
- /* No need to redraw if frame will be redrawn soon except under NS
- where the toolkit may have already modified the frame in
- expectation of us redrawing it. */
if (FRAME_GARBAGED_P (f))
{
TRACE ((stderr, " garbaged\n"));
return;
}
-#endif
/* If basic faces haven't been realized yet, there is no point in
trying to redraw anything. This can happen when we get an expose