comparison src/xdisp.c @ 2742:7800e6a86421

* xdisp.c (display_text_line): Make face-handling code conditional on HAVE_X_WINDOWS macro. Perhaps this isn't the best approach, but it'll do for now. * xdisp.c (display_text_line): We can't use the FRAME_DEFAULT_FACE macro here; that's x-specific. Just don't pass the second argument. * xfaces.c (compute_glyph_face): Remove the BASIC_FACE argument; use F's default face.

2741:1d72336294c6

	      cursor_hpos = p1 - startp;
	    }

	  pause = end;

	  /* Did we hit a face change?  Figure out what face we should
	     use now.  We also hit this the first time through the
	     loop, to see what face we should start with.  */
	  if (pos == next_face_change)
	    {
	      current_face = compute_char_face (f, w, pos, &next_face_change);
	      if (pos < next_face_change && next_face_change < pause)
		pause = next_face_change;
	    }

	  /* Wouldn't you hate to read the next line to someone over
             the phone?  */
	  if (pos < point && point < pause)
	    pause = point;

	  if (p1 >= startp && p1 < endp)
	    *p1 = MAKE_GLYPH ((7 & c) + '0', 0);
	  p1++;
	}

      /* Now we've laid down some characters between p1prev and p1.
	 Let's apply current_face to those who have a face of zero
	 (the default), and apply Vglyph_table to the result.  */
      if (current_face)
	{

	  for (gp = gstart; gp < gend; gp++)
	    *gp = MAKE_GLYPH (GLYPH_CHAR (*gp),
			      (GLYPH_FACE (*gp) == 0
			       ? current_face
			       : compute_glyph_face (f, FRAME_DEFAULT_FACE (f),
						     GLYPH_FACE (*gp))));
	}

      pos++;
    }

  val.hpos = - XINT (w->hscroll);

2742:7800e6a86421

	      cursor_hpos = p1 - startp;
	    }

	  pause = end;

#ifdef HAVE_X_WINDOWS
	  /* Did we hit a face change?  Figure out what face we should
	     use now.  We also hit this the first time through the
	     loop, to see what face we should start with.  */
	  if (pos == next_face_change)
	    {
	      current_face = compute_char_face (f, w, pos, &next_face_change);
	      if (pos < next_face_change && next_face_change < pause)
		pause = next_face_change;
	    }
#endif

	  /* Wouldn't you hate to read the next line to someone over
             the phone?  */
	  if (pos < point && point < pause)
	    pause = point;

	  if (p1 >= startp && p1 < endp)
	    *p1 = MAKE_GLYPH ((7 & c) + '0', 0);
	  p1++;
	}

#ifdef HAVE_X_WINDOWS
      /* Now we've laid down some characters between p1prev and p1.
	 Let's apply current_face to those who have a face of zero
	 (the default), and apply Vglyph_table to the result.  */
      if (current_face)
	{

	  for (gp = gstart; gp < gend; gp++)
	    *gp = MAKE_GLYPH (GLYPH_CHAR (*gp),
			      (GLYPH_FACE (*gp) == 0
			       ? current_face
			       : compute_glyph_face (f, GLYPH_FACE (*gp))));
	}
#endif

      pos++;
    }

  val.hpos = - XINT (w->hscroll);