[Emacs-diffs] Changes to emacs/src/macfns.c

[Jan Djärv]

Index: emacs/src/macfns.c
diff -u emacs/src/macfns.c:1.70 emacs/src/macfns.c:1.71
--- emacs/src/macfns.c:1.70     Mon Oct 31 08:36:55 2005
+++ emacs/src/macfns.c  Mon Dec 12 09:32:50 2005
@@ -3840,13 +3840,15 @@
 
   if (INTEGERP (top))
     *root_y = XINT (top);
-  else if (*root_y + XINT (dy) - height < 0)
-    *root_y -= XINT (dy);
-  else
-    {
-      *root_y -= height;
+  else if (*root_y + XINT (dy) + height <= FRAME_MAC_DISPLAY_INFO (f)->height)
+    /* It fits below the pointer */
       *root_y += XINT (dy);
-    }
+  else if (height + XINT (dy) <= *root_y)
+    /* It fits above the pointer.  */
+    *root_y -= height + XINT (dy);
+  else
+    /* Put it on the top.  */
+    *root_y = 0;
 
   if (INTEGERP (left))
     *root_x = XINT (left);