Mercurial > emacs
changeset 96493:eee935c288d1
(next_element_from_display_vector): Move assignment out
of if statement.
| author | Jason Rumney <jasonr@gnu.org> |
|---|---|
| date | Wed, 02 Jul 2008 15:20:33 +0000 |
| parents | 7d58361bf4f2 |
| children | 80ac8ab05d8d |
| files | src/xdisp.c |
| diffstat | 1 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/xdisp.c Wed Jul 02 13:34:11 2008 +0000 +++ b/src/xdisp.c Wed Jul 02 15:20:33 2008 +0000 @@ -6227,9 +6227,9 @@ /* KFS: This code used to check ip->dpvec[0] instead of the current element. That seemed totally bogus - so I changed it... */ - - if ((gc = it->dpvec[it->current.dpvec_index], GLYPH_CODE_P (gc)) - && GLYPH_CODE_CHAR_VALID_P (gc)) + gc = it->dpvec[it->current.dpvec_index]; + + if (GLYPH_CODE_P (gc) && GLYPH_CODE_CHAR_VALID_P (gc)) { it->c = GLYPH_CODE_CHAR (gc); it->len = CHAR_BYTES (it->c);