diff options
| author | Kim F. Storm <storm@cua.dk> | 2005-01-20 15:23:22 +0000 |
|---|---|---|
| committer | Kim F. Storm <storm@cua.dk> | 2005-01-20 15:23:22 +0000 |
| commit | 82ead4b1427e6804c18ed7acb7c8e99a93059af0 (patch) | |
| tree | 6d3d6658c359340618dbbd1ec5a004f23c4260b9 /src/macterm.c | |
| parent | c310aca4a74ce5409602b91466d94a5a4fbccfbb (diff) | |
| download | emacs-82ead4b1427e6804c18ed7acb7c8e99a93059af0.tar.gz emacs-82ead4b1427e6804c18ed7acb7c8e99a93059af0.tar.bz2 emacs-82ead4b1427e6804c18ed7acb7c8e99a93059af0.zip | |
(x_draw_glyph_string_box): Fix last_x for full width rows.
Diffstat (limited to 'src/macterm.c')
| -rw-r--r-- | src/macterm.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/macterm.c b/src/macterm.c index ebebb129bb8..24aaa52947b 100644 --- a/src/macterm.c +++ b/src/macterm.c @@ -2642,15 +2642,9 @@ x_draw_glyph_string_box (s) struct glyph *last_glyph; Rect clip_rect; - last_x = window_box_right (s->w, s->area); - if (s->row->full_width_p - && !s->w->pseudo_window_p) - { - last_x += WINDOW_RIGHT_SCROLL_BAR_AREA_WIDTH (s->w); - if (s->area != RIGHT_MARGIN_AREA - || WINDOW_HAS_FRINGES_OUTSIDE_MARGINS (s->w)) - last_x += WINDOW_RIGHT_FRINGE_WIDTH (s->w); - } + last_x = ((s->row->full_width_p && !s->w->pseudo_window_p) + ? WINDOW_RIGHT_EDGE_X (s->w) + : window_box_right (s->w, s->area)); /* The glyph that may have a right box line. */ last_glyph = (s->cmp || s->img |