(Fwindow_inside_edges, Fwindow_inside_pixel_edges): Correct the right value.

diff --git a/src/ChangeLog b/src/ChangeLog
index 951bf142541e8c78a2c65ded78f6374dd7c26718..a6b9ca9e5f10f8bc15d2786ab92db8092bbad9c3 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-20  KOBAYASHI Yasuhiro  <kobayays@otsukakj.co.jp>
+
+       * window.c (Fwindow_inside_edges, Fwindow_inside_pixel_edges):
+       Correct the right value.
+
 2005-05-19  Nick Roberts  <nickrob@snap.net.nz>
 
        * keyboard.c (syms_of_keyboard): Remove lisp variables

diff --git a/src/window.c b/src/window.c
index 5e399afd28efaee3c86f7376906189e13007e6e2..faf88c91ffc5defbaa569af236d5d45afb4fe9da 100644 (file)
--- a/src/window.c
+++ b/src/window.c
@@ -544,7 +544,7 @@ display margins, fringes, header line, and/or mode line.  */)
                             + WINDOW_LEFT_FRINGE_COLS (w)),
                make_number (WINDOW_TOP_EDGE_LINE (w)
                             + WINDOW_HEADER_LINE_LINES (w)),
-               make_number (WINDOW_RIGHT_EDGE_COL (w)
+               make_number (WINDOW_BOX_RIGHT_EDGE_COL (w)
                             - WINDOW_RIGHT_MARGIN_COLS (w)
                             - WINDOW_RIGHT_FRINGE_COLS (w)),
                make_number (WINDOW_BOTTOM_EDGE_LINE (w)
@@ -568,7 +568,7 @@ display margins, fringes, header line, and/or mode line.  */)
                             + WINDOW_LEFT_FRINGE_WIDTH (w)),
                make_number (WINDOW_TOP_EDGE_Y (w)
                             + WINDOW_HEADER_LINE_HEIGHT (w)),
-               make_number (WINDOW_RIGHT_EDGE_X (w)
+               make_number (WINDOW_BOX_RIGHT_EDGE_X (w)
                             - WINDOW_RIGHT_MARGIN_WIDTH (w)
                             - WINDOW_RIGHT_FRINGE_WIDTH (w)),
                make_number (WINDOW_BOTTOM_EDGE_Y (w)