From: Gerd Moellmann <gerd@gnu.org>
Date: Mon, 30 Aug 1999 23:14:22 +0000 (+0000)
Subject: (WINDOW_DISPLAY_PIXEL_WIDTH): Subtract
X-Git-Tag: emacs-pretest-21.0.90~6983
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e1b7d46cbdc204ee760889b123f1c4403f22ec3d;p=emacs.git

(WINDOW_DISPLAY_PIXEL_WIDTH): Subtract
FRAME_FLAGS_AREA_COLS once.
(WINDOW_DISPLAY_LEFT_EDGE_PIXEL_X): Add
FRAME_LEFT_FLAGS_AREA_WIDTH instead of FRAME_FLAGS_AREA_WIDTH.
---

diff --git a/src/dispextern.h b/src/dispextern.h
index a8c02390ccf..9a8af123ef0 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -907,7 +907,7 @@ extern struct glyph_row scratch_glyph_row;
 #define WINDOW_DISPLAY_PIXEL_WIDTH(W)					\
      (((XFASTINT ((W)->width)						\
         - FRAME_SCROLL_BAR_WIDTH (XFRAME (WINDOW_FRAME ((W))))		\
-	- 2 * FRAME_FLAGS_AREA_COLS (XFRAME (WINDOW_FRAME ((W)))))	\
+	- FRAME_FLAGS_AREA_COLS (XFRAME (WINDOW_FRAME ((W)))))		\
        * CANON_X_UNIT (XFRAME (WINDOW_FRAME ((W))))))
 
 /* Height of the display region of W, including a mode line, if any.  */
@@ -951,7 +951,7 @@ extern struct glyph_row scratch_glyph_row;
      (FRAME_INTERNAL_BORDER_WIDTH_SAFE (XFRAME (WINDOW_FRAME ((W))))	\
       + (WINDOW_LEFT_MARGIN ((W))					\
          * CANON_X_UNIT (XFRAME (WINDOW_FRAME ((W)))))			\
-      + FRAME_FLAGS_AREA_WIDTH (XFRAME (WINDOW_FRAME ((W)))))
+      + FRAME_LEFT_FLAGS_AREA_WIDTH (XFRAME (WINDOW_FRAME ((W)))))
 
 /* Right edge of window W in pixels, relative to its frame.  */