aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog13
-rw-r--r--src/window.c4
2 files changed, 15 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index fd62357353..088a3a9aac 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,18 @@
2000-03-05 Gerd Moellmann <[email protected]>
+ * 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.
diff --git a/src/window.c b/src/window.c
index a838c0b655..a1764ee3fa 100644
--- a/src/window.c
+++ b/src/window.c
@@ -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);
}