diff options
| author | Kim F. Storm | 2005-01-17 08:28:28 +0000 |
|---|---|---|
| committer | Kim F. Storm | 2005-01-17 08:28:28 +0000 |
| commit | cfde341f3bf4214108cb2aede40ad6f6c1783d23 (patch) | |
| tree | 57383f0db5a1b6fd11b55d155f4bc9d2533a91bb /src | |
| parent | 977284ccb18100f3b3660799b7d2f507bea4c28b (diff) | |
| download | emacs-cfde341f3bf4214108cb2aede40ad6f6c1783d23.tar.gz emacs-cfde341f3bf4214108cb2aede40ad6f6c1783d23.zip | |
(mode_line_string, marginal_area_string): Fix
off-by-one error in search for glyph.
Diffstat (limited to 'src')
| -rw-r--r-- | src/dispnew.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/dispnew.c b/src/dispnew.c index ff26a4dc66c..1c3c56de80b 100644 --- a/src/dispnew.c +++ b/src/dispnew.c | |||
| @@ -5842,7 +5842,7 @@ mode_line_string (w, part, x, y, charpos, object, dx, dy, width, height) | |||
| 5842 | it's the one we were looking for. */ | 5842 | it's the one we were looking for. */ |
| 5843 | glyph = row->glyphs[TEXT_AREA]; | 5843 | glyph = row->glyphs[TEXT_AREA]; |
| 5844 | end = glyph + row->used[TEXT_AREA]; | 5844 | end = glyph + row->used[TEXT_AREA]; |
| 5845 | for (x0 = *x; glyph < end && x0 > glyph->pixel_width; ++glyph) | 5845 | for (x0 = *x; glyph < end && x0 >= glyph->pixel_width; ++glyph) |
| 5846 | x0 -= glyph->pixel_width; | 5846 | x0 -= glyph->pixel_width; |
| 5847 | *x = glyph - row->glyphs[TEXT_AREA]; | 5847 | *x = glyph - row->glyphs[TEXT_AREA]; |
| 5848 | if (glyph < end) | 5848 | if (glyph < end) |
| @@ -5934,7 +5934,7 @@ marginal_area_string (w, part, x, y, charpos, object, dx, dy, width, height) | |||
| 5934 | 5934 | ||
| 5935 | glyph = row->glyphs[area]; | 5935 | glyph = row->glyphs[area]; |
| 5936 | end = glyph + row->used[area]; | 5936 | end = glyph + row->used[area]; |
| 5937 | for (x0 = *x - x0; glyph < end && x0 > glyph->pixel_width; ++glyph) | 5937 | for (x0 = *x - x0; glyph < end && x0 >= glyph->pixel_width; ++glyph) |
| 5938 | x0 -= glyph->pixel_width; | 5938 | x0 -= glyph->pixel_width; |
| 5939 | *x = glyph - row->glyphs[area]; | 5939 | *x = glyph - row->glyphs[area]; |
| 5940 | if (glyph < end) | 5940 | if (glyph < end) |