diff options
| author | Kim F. Storm | 2005-01-20 15:23:22 +0000 |
|---|---|---|
| committer | Kim F. Storm | 2005-01-20 15:23:22 +0000 |
| commit | 82ead4b1427e6804c18ed7acb7c8e99a93059af0 (patch) | |
| tree | 6d3d6658c359340618dbbd1ec5a004f23c4260b9 /src/w32term.c | |
| parent | c310aca4a74ce5409602b91466d94a5a4fbccfbb (diff) | |
| download | emacs-82ead4b1427e6804c18ed7acb7c8e99a93059af0.tar.gz emacs-82ead4b1427e6804c18ed7acb7c8e99a93059af0.zip | |
(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) | |||
| 1921 | struct glyph *last_glyph; | 1921 | struct glyph *last_glyph; |
| 1922 | RECT clip_rect; | 1922 | RECT clip_rect; |
| 1923 | 1923 | ||
| 1924 | last_x = window_box_right (s->w, s->area); | 1924 | last_x = ((s->row->full_width_p && !s->w->pseudo_window_p) |
| 1925 | if (s->row->full_width_p | 1925 | ? WINDOW_RIGHT_EDGE_X (s->w) |
| 1926 | && !s->w->pseudo_window_p) | 1926 | : window_box_right (s->w, s->area)); |
| 1927 | { | ||
| 1928 | last_x += WINDOW_RIGHT_SCROLL_BAR_AREA_WIDTH (s->w); | ||
| 1929 | if (s->area != RIGHT_MARGIN_AREA | ||
| 1930 | || WINDOW_HAS_FRINGES_OUTSIDE_MARGINS (s->w)) | ||
| 1931 | last_x += WINDOW_RIGHT_FRINGE_WIDTH (s->w); | ||
| 1932 | } | ||
| 1933 | 1927 | ||
| 1934 | /* The glyph that may have a right box line. */ | 1928 | /* The glyph that may have a right box line. */ |
| 1935 | last_glyph = (s->cmp || s->img | 1929 | last_glyph = (s->cmp || s->img |