From 9af3143a29edc6d09019dcdebc2129abe118598d Mon Sep 17 00:00:00 2001
From: "Richard M. Stallman" <rms@gnu.org>
Date: Wed, 22 Nov 1995 12:38:53 +0000
Subject: [PATCH] (XTmouse_position): Exit the loop if child == win.
 (x_iconify_frame): Call FRAME_SAMPLE_VISIBILITY.

---
 src/xterm.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/xterm.c b/src/xterm.c
index f1f312a55f5..906709fe99e 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -2354,7 +2354,7 @@ XTmouse_position (fp, insist, bar_window, part, x, y, time)
 				       /* Child of win.  */
 				       &child);
 
-		if (child == None)
+		if (child == None || child == win)
 		  break;
 
 		win = child;
@@ -5454,6 +5454,8 @@ x_iconify_frame (f)
 
   BLOCK_INPUT;
 
+  FRAME_SAMPLE_VISIBILITY (f);
+
   type = x_icon_type (f);
   if (!NILP (type))
     x_bitmap_icon (f, type);
-- 
2.11.4.GIT