# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 885419038 0
# Node ID 524d1cfb6913edca5b4f98336c385b0eff6a792b
# Parent  907d8633c8cc0f296706ab5256bfb921711991e4
(WINDOW_RIGHT_MARGIN): Deduct width of vertical line
if frame has no scroll bars.

diff -r 907d8633c8cc -r 524d1cfb6913 src/window.h
--- a/src/window.h	Wed Jan 21 21:43:30 1998 +0000
+++ b/src/window.h	Wed Jan 21 21:43:58 1998 +0000
@@ -207,13 +207,15 @@
 
 /* Return the frame column before which the text in window W ends.
    This is different from WINDOW_RIGHT_EDGE because it does not include
-   a right-hand scroll bar if any.  */
+   a scroll bar or window-separating line on the right edge.  */
 
-#define WINDOW_RIGHT_MARGIN(W) \
-     (WINDOW_RIGHT_EDGE (W) \
-      - (FRAME_HAS_VERTICAL_SCROLL_BARS_ON_RIGHT (XFRAME (WINDOW_FRAME (W))) \
-	 ? FRAME_SCROLL_BAR_COLS (XFRAME (WINDOW_FRAME (W))) \
-	 : 0))
+#define WINDOW_RIGHT_MARGIN(W)						    \
+  (WINDOW_RIGHT_EDGE (W)						    \
+   - (! FRAME_HAS_VERTICAL_SCROLL_BARS (XFRAME (WINDOW_FRAME (W)))	    \
+      ? 1								    \
+      : FRAME_HAS_VERTICAL_SCROLL_BARS_ON_RIGHT (XFRAME (WINDOW_FRAME (W))) \
+      ? FRAME_SCROLL_BAR_COLS (XFRAME (WINDOW_FRAME (W)))		    \
+      : 0))
 
 /* 1 if window W takes up the full width of its frame.  */