# HG changeset patch
# User Jason Rumney <jasonr@gnu.org>
# Date 1215012033 0
# Node ID eee935c288d17e442a1367a859f75acdd988f8c2
# Parent  7d58361bf4f252f853e843a23004f649912503a3
(next_element_from_display_vector): Move assignment out
of if statement.

diff -r 7d58361bf4f2 -r eee935c288d1 src/xdisp.c
--- 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);