(Fcoordinates_in_window_p): Take account of FRAME_INTERNAL_BORDER_WIDTH.

2 files changed, 9 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 398538484d7..55df91b982e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2004-07-25  Richard M. Stallman  <rms@gnu.org>
+
+        * window.c (Fcoordinates_in_window_p): 
+        Take account of FRAME_INTERNAL_BORDER_WIDTH.
+
+        * alloc.c (check_cons_list): New function (contents commented out).
+
 2004-07-24  Luc Teirlinck  <teirllm@auburn.edu>
 
         * xfaces.c (Fcolor_supported_p): Doc fix.
diff --git a/src/window.c b/src/window.c
index 409d0972fdd..8a574becd06 100644
--- a/src/window.c
+++ b/src/window.c
@@ -783,8 +783,8 @@ If they are in the windows's left or right marginal areas, `left-margin'\n\
   ly = Fcdr (coordinates);
   CHECK_NUMBER_OR_FLOAT (lx);
   CHECK_NUMBER_OR_FLOAT (ly);
-  x = FRAME_PIXEL_X_FROM_CANON_X (f, lx);
-  y = FRAME_PIXEL_Y_FROM_CANON_Y (f, ly);
+  x = FRAME_PIXEL_X_FROM_CANON_X (f, lx) + FRAME_INTERNAL_BORDER_WIDTH (f);
+  y = FRAME_PIXEL_Y_FROM_CANON_Y (f, ly) + FRAME_INTERNAL_BORDER_WIDTH (f);
 
   switch (coordinates_in_window (w, &x, &y))
     {