]> git.eshelyaron.com Git - emacs.git/commitdiff
(coordinates_in_window): Use
authorGerd Moellmann <gerd@gnu.org>
Sun, 5 Mar 2000 20:22:48 +0000 (20:22 +0000)
committerGerd Moellmann <gerd@gnu.org>
Sun, 5 Mar 2000 20:22:48 +0000 (20:22 +0000)
FRAME_INTERNAL_BORDER_WIDTH_SAFE instead of
FRAME_INTERNAL_BORDER_WIDTH.

src/ChangeLog
src/window.c

index fd62357353c0fe4c11679668d21f98a23fff6bd6..088a3a9aacd426ab1ffe9341337ba3980140d934 100644 (file)
@@ -1,5 +1,18 @@
 2000-03-05  Gerd Moellmann  <gerd@gnu.org>
 
+       * Makefile.in (tags): Include ../lwlib/TAGS in TAGS.
+
+       * xfns.c (QCdata): Moved to xdisp.c.
+
+       * xdisp.c (QCdata): Moved here from xfns.c.
+       (syms_of_xdisp): Initialize QCdata.
+
+       * frame.h (FRAME_INTERNAL_BORDER_WIDTH) [!HAVE_X_WINDOWS]: Define.
+
+       * window.c (coordinates_in_window): Use
+       FRAME_INTERNAL_BORDER_WIDTH_SAFE instead of
+       FRAME_INTERNAL_BORDER_WIDTH.
+
        * xdisp.c (try_window_id): Recompute unchanged information if
        it is invalid.
 
index a838c0b6558e91414de7b3eb0632c84913b3ee55..a1764ee3fa66df4e4bef4ecdc03dfc37354fe0da 100644 (file)
@@ -468,10 +468,10 @@ coordinates_in_window (w, x, y)
   else
     {
       left_x = (WINDOW_DISPLAY_LEFT_EDGE_PIXEL_X (w)
-               - FRAME_INTERNAL_BORDER_WIDTH (f));
+               - FRAME_INTERNAL_BORDER_WIDTH_SAFE (f));
       right_x = WINDOW_DISPLAY_RIGHT_EDGE_PIXEL_X (w);
       top_y = (WINDOW_DISPLAY_TOP_EDGE_PIXEL_Y (w)
-              - FRAME_INTERNAL_BORDER_WIDTH (f));
+              - FRAME_INTERNAL_BORDER_WIDTH_SAFE (f));
       bottom_y = WINDOW_DISPLAY_BOTTOM_EDGE_PIXEL_Y (w);
     }