From: Jason Rumney <jasonr@gnu.org>
Date: Wed, 2 Jul 2008 15:20:33 +0000 (+0000)
Subject: (next_element_from_display_vector): Move assignment out
X-Git-Tag: emacs-pretest-23.0.90~4341
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=631855b50662f1fe2f7ae671c79bd129dd79173c;p=emacs.git

(next_element_from_display_vector): Move assignment out
of if statement.
---

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);