summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Rumney <jasonr@gnu.org>2008-07-02 15:20:33 +0000
committerJason Rumney <jasonr@gnu.org>2008-07-02 15:20:33 +0000
commit631855b50662f1fe2f7ae671c79bd129dd79173c (patch)
tree21c3115751f07c70d3d4901ccbd39c3c0fd2707b
parent55880911a31d8b680713e15c62d314cf2c6fb488 (diff)
downloademacs-631855b50662f1fe2f7ae671c79bd129dd79173c.tar.gz
emacs-631855b50662f1fe2f7ae671c79bd129dd79173c.tar.bz2
emacs-631855b50662f1fe2f7ae671c79bd129dd79173c.zip
(next_element_from_display_vector): Move assignment out
of if statement.
-rw-r--r--src/xdisp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/xdisp.c b/src/xdisp.c
index 692db8b4999..c0f0ca9df1b 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -6227,9 +6227,9 @@ next_element_from_display_vector (it)
/* KFS: This code used to check ip->dpvec[0] instead of the current element.
That seemed totally bogus - so I changed it... */
+ gc = it->dpvec[it->current.dpvec_index];
- if ((gc = it->dpvec[it->current.dpvec_index], GLYPH_CODE_P (gc))
- && GLYPH_CODE_CHAR_VALID_P (gc))
+ if (GLYPH_CODE_P (gc) && GLYPH_CODE_CHAR_VALID_P (gc))
{
it->c = GLYPH_CODE_CHAR (gc);
it->len = CHAR_BYTES (it->c);