2 files changed, 3 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 85f3abb98b3..74482f8c84d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -8,6 +8,8 @@
         Ifdef away legacy code.
         (XTmouse_position, x_scroll_bar_report_motion):
         Use x_last_mouse_movement_time.
+        (handle_one_xevent): Use event.xunmap and not event.xmap when handling
+        UnmapNotify event.
 
 2013-09-02  Dmitry Antipov  <dmantipov@yandex.ru>
 
diff --git a/src/xterm.c b/src/xterm.c
index 1870aae5a6d..2def3ef11d5 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -6183,7 +6183,7 @@ handle_one_xevent (struct x_display_info *dpyinfo, XEvent *eventptr,
 
     case UnmapNotify:
       /* Redo the mouse-highlight after the tooltip has gone.  */
-      if (event.xmap.window == tip_window)
+      if (event.xunmap.window == tip_window)
         {
           tip_window = 0;
           redo_mouse_highlight ();