diff options
| author | Richard M. Stallman <rms@gnu.org> | 1998-01-21 21:43:58 +0000 |
|---|---|---|
| committer | Richard M. Stallman <rms@gnu.org> | 1998-01-21 21:43:58 +0000 |
| commit | 14a65ffe4289dc2a067b9635cc3a56606383e23a (patch) | |
| tree | 66d2d9b62447ba44e0a98d0f70e032ee7d05a239 /src/window.h | |
| parent | 06f57aa7fd6d9c56f81c10a42d300dfff6d438bf (diff) | |
| download | emacs-14a65ffe4289dc2a067b9635cc3a56606383e23a.tar.gz | |
(WINDOW_RIGHT_MARGIN): Deduct width of vertical line
if frame has no scroll bars.
Diffstat (limited to 'src/window.h')
| -rw-r--r-- | src/window.h | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/window.h b/src/window.h index c04d654639b..6827449649a 100644 --- a/src/window.h +++ b/src/window.h @@ -207,13 +207,15 @@ struct window /* 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. */ - -#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)) + 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 (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. */ |