Mercurial > emacs

changeset 20700:524d1cfb6913

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(WINDOW_RIGHT_MARGIN): Deduct width of vertical line if frame has no scroll bars.
author Richard M. Stallman <rms@gnu.org>
date Wed, 21 Jan 1998 21:43:58 +0000
parents 907d8633c8cc
children 59ffd6ac16ec
files src/window.h
diffstat 1 files changed, 8 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- 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.  */