diff options
| author | Gerd Moellmann | 2001-03-23 12:26:28 +0000 |
|---|---|---|
| committer | Gerd Moellmann | 2001-03-23 12:26:28 +0000 |
| commit | 091f887891422b7fc5e769b62c76cc6600ccc7b1 (patch) | |
| tree | 1545cc0a1e537fa3b961137c669bfff50fc0f422 /src | |
| parent | 991786ddc0a6df95119c4fe05f01e49065c58483 (diff) | |
| download | emacs-091f887891422b7fc5e769b62c76cc6600ccc7b1.tar.gz emacs-091f887891422b7fc5e769b62c76cc6600ccc7b1.zip | |
(dump_glyph_row): Fix output for NGLYPHS == 2.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/xdisp.c | 7 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 1a5f2e9051c..2cd44be9171 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2001-03-23 Gerd Moellmann <gerd@gnu.org> | ||
| 2 | |||
| 3 | * xdisp.c (dump_glyph_row): Fix output for NGLYPHS == 2. | ||
| 4 | |||
| 1 | 2001-03-23 Eli Zaretskii <eliz@is.elta.co.il> | 5 | 2001-03-23 Eli Zaretskii <eliz@is.elta.co.il> |
| 2 | 6 | ||
| 3 | * xmenu.c: Include widget.h only if USE_X_TOOLKIT is defined. | 7 | * xmenu.c: Include widget.h only if USE_X_TOOLKIT is defined. |
diff --git a/src/xdisp.c b/src/xdisp.c index 5bef4697058..712860d51e9 100644 --- a/src/xdisp.c +++ b/src/xdisp.c | |||
| @@ -11732,12 +11732,11 @@ dump_glyph_row (matrix, vpos, glyphs) | |||
| 11732 | 11732 | ||
| 11733 | for (area = LEFT_MARGIN_AREA; area < LAST_AREA; ++area) | 11733 | for (area = LEFT_MARGIN_AREA; area < LAST_AREA; ++area) |
| 11734 | { | 11734 | { |
| 11735 | struct glyph *glyph, *glyph_end; | 11735 | struct glyph *glyph = row->glyphs[area]; |
| 11736 | glyph = row->glyphs[area]; | 11736 | struct glyph *glyph_end = glyph + row->used[area]; |
| 11737 | glyph_end = glyph + row->used[area]; | ||
| 11738 | 11737 | ||
| 11739 | /* Glyph for a line end in text. */ | 11738 | /* Glyph for a line end in text. */ |
| 11740 | if (glyph == glyph_end && glyph->charpos > 0) | 11739 | if (area == TEXT_AREA && glyph == glyph_end && glyph->charpos > 0) |
| 11741 | ++glyph_end; | 11740 | ++glyph_end; |
| 11742 | 11741 | ||
| 11743 | if (glyph < glyph_end) | 11742 | if (glyph < glyph_end) |