comparison src/xdisp.c @ 96493:eee935c288d1

(next_element_from_display_vector): Move assignment out of if statement.

96492:7d58361bf4f2

  it->face_id = it->saved_face_id;

  /* 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))
    {
      it->c = GLYPH_CODE_CHAR (gc);
      it->len = CHAR_BYTES (it->c);

      /* The entry may contain a face id to use.  Such a face id is

96493:eee935c288d1

  it->face_id = it->saved_face_id;

  /* 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 (GLYPH_CODE_P (gc) && GLYPH_CODE_CHAR_VALID_P (gc))
    {
      it->c = GLYPH_CODE_CHAR (gc);
      it->len = CHAR_BYTES (it->c);

      /* The entry may contain a face id to use.  Such a face id is