[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/macfns.c
From: |
Jan Djärv |
Subject: |
[Emacs-diffs] Changes to emacs/src/macfns.c |
Date: |
Wed, 14 Dec 2005 20:58:33 +0000 |
Index: emacs/src/macfns.c
diff -u emacs/src/macfns.c:1.71 emacs/src/macfns.c:1.72
--- emacs/src/macfns.c:1.71 Mon Dec 12 09:32:50 2005
+++ emacs/src/macfns.c Wed Dec 14 20:58:33 2005
@@ -3840,9 +3840,11 @@
if (INTEGERP (top))
*root_y = XINT (top);
+ else if (*root_y + XINT (dy) <= 0)
+ *root_y = 0; /* Can happen for negative dy */
else if (*root_y + XINT (dy) + height <= FRAME_MAC_DISPLAY_INFO (f)->height)
/* It fits below the pointer */
- *root_y += XINT (dy);
+ *root_y += XINT (dy);
else if (height + XINT (dy) <= *root_y)
/* It fits above the pointer. */
*root_y -= height + XINT (dy);
@@ -3852,6 +3854,8 @@
if (INTEGERP (left))
*root_x = XINT (left);
+ else if (*root_x + XINT (dx) <= 0)
+ *root_x = 0; /* Can happen for negative dx */
else if (*root_x + XINT (dx) + width <= FRAME_MAC_DISPLAY_INFO (f)->width)
/* It fits to the right of the pointer. */
*root_x += XINT (dx);