Mercurial > emacs
comparison src/xdisp.c @ 25463:255017b70168
(window_box_width): Use FRAME_FLAGS_AREA_COLS instead of
2 * that value.
(window_box_left): Use FRAME_LEFT_FLAGS_AREA_WIDTH instead of
FRAME_FLAGS_AREA_WIDTH.
| author | Gerd Moellmann <gerd@gnu.org> |
|---|---|
| date | Mon, 30 Aug 1999 23:14:28 +0000 |
| parents | 5a3db5249db9 |
| children | 28588533d342 |
comparison
equal
deleted
inserted
replaced
| 25462:19b101d6ee2a | 25463:255017b70168 |
|---|---|
| 733 struct frame *f = XFRAME (w->frame); | 733 struct frame *f = XFRAME (w->frame); |
| 734 int width = XFASTINT (w->width); | 734 int width = XFASTINT (w->width); |
| 735 | 735 |
| 736 if (!w->pseudo_window_p) | 736 if (!w->pseudo_window_p) |
| 737 { | 737 { |
| 738 width -= FRAME_SCROLL_BAR_WIDTH (f) + 2 * FRAME_FLAGS_AREA_COLS (f); | 738 width -= FRAME_SCROLL_BAR_WIDTH (f) + FRAME_FLAGS_AREA_COLS (f); |
| 739 | 739 |
| 740 if (area == TEXT_AREA) | 740 if (area == TEXT_AREA) |
| 741 { | 741 { |
| 742 if (INTEGERP (w->left_margin_width)) | 742 if (INTEGERP (w->left_margin_width)) |
| 743 width -= XFASTINT (w->left_margin_width); | 743 width -= XFASTINT (w->left_margin_width); |
| 790 int x = FRAME_INTERNAL_BORDER_WIDTH_SAFE (f); | 790 int x = FRAME_INTERNAL_BORDER_WIDTH_SAFE (f); |
| 791 | 791 |
| 792 if (!w->pseudo_window_p) | 792 if (!w->pseudo_window_p) |
| 793 { | 793 { |
| 794 x += (WINDOW_LEFT_MARGIN (w) * CANON_X_UNIT (f) | 794 x += (WINDOW_LEFT_MARGIN (w) * CANON_X_UNIT (f) |
| 795 + FRAME_FLAGS_AREA_WIDTH (f)); | 795 + FRAME_LEFT_FLAGS_AREA_WIDTH (f)); |
| 796 | 796 |
| 797 if (area == TEXT_AREA) | 797 if (area == TEXT_AREA) |
| 798 x += window_box_width (w, LEFT_MARGIN_AREA); | 798 x += window_box_width (w, LEFT_MARGIN_AREA); |
| 799 else if (area == RIGHT_MARGIN_AREA) | 799 else if (area == RIGHT_MARGIN_AREA) |
| 800 x += (window_box_width (w, LEFT_MARGIN_AREA) | 800 x += (window_box_width (w, LEFT_MARGIN_AREA) |