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 | edabee9b04c4f48f66a651c21bd56be9e189e734 (patch) | |
| tree | 85764544501dfb754eeb4759f19b5ed1d1d2a2e2 /src/w32term.c | |
| parent | d8a849d16815614a96bb3312c3142f5a9d8a85bd (diff) | |
| download | emacs-edabee9b04c4f48f66a651c21bd56be9e189e734.tar.gz | |
(x_draw_glyph_string_box): Fix last_x for full width rows.
Diffstat (limited to 'src/w32term.c')
| -rw-r--r-- | src/w32term.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/w32term.c b/src/w32term.c index a0b00d58659..838e1f57222 100644 --- a/src/w32term.c +++ b/src/w32term.c @@ -1921,15 +1921,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 |