2 files changed, 8 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index cadfad7c48f..ee9eed6739b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-02  Eli Zaretskii  <eliz@gnu.org>
+
+        * w32fns.c (compute_tip_xy): Put tip above pointer if it doesn't
+        fit below.
+
 2005-12-02  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 
         * xterm.h: Add prototype for xg_set_icon_from_xpm_data.
diff --git a/src/w32fns.c b/src/w32fns.c
index e18ee3d43a9..6fc6c860808 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -7413,6 +7413,9 @@ compute_tip_xy (f, parms, dx, dy, width, height, root_x, root_y)
     *root_y = XINT (top);
   else if (*root_y + XINT (dy) - height < 0)
     *root_y -= XINT (dy);
+  /* If there's not enough place below the pointer, put tip above it.  */
+  else if (*root_y + XINT (dy) >= FRAME_W32_DISPLAY_INFO (f)->height)
+    *root_y -= XINT (dy);
   else
     {
       *root_y -= height;