comparison src/xdisp.c @ 55183:b4f51693f2db

(x_produce_glyphs): Fix last change; handle newline in header line strings.

55182:bd90e5660360

	  Lisp_Object lsp, lh;

	  it->pixel_width = 0;
	  it->nglyphs = 0;

	  lh = Fget_text_property (IT_CHARPOS (*it), Qline_height, it->w->buffer);

	  if (EQ (lh, Qt))
	    {
	      it->use_default_face = 1;
	      font = FRAME_FONT (it->f);

	      if (explicit_height > it->ascent + it->descent)
		it->ascent = explicit_height - it->descent;
	    }

	  lsp = Fget_text_property (IT_CHARPOS (*it), Qline_spacing, it->w->buffer);
	  if (INTEGERP (lsp))
	    extra_line_spacing = XINT (lsp);
	  else if (FLOATP (lsp))
	    extra_line_spacing = (it->phys_ascent + it->phys_descent) * XFLOAT_DATA (lsp);
	}

55183:b4f51693f2db

	  Lisp_Object lsp, lh;

	  it->pixel_width = 0;
	  it->nglyphs = 0;

	  lh = Fget_text_property (IT_CHARPOS (*it), Qline_height, it->object);

	  if (EQ (lh, Qt))
	    {
	      it->use_default_face = 1;
	      font = FRAME_FONT (it->f);

	      if (explicit_height > it->ascent + it->descent)
		it->ascent = explicit_height - it->descent;
	    }

	  lsp = Fget_text_property (IT_CHARPOS (*it), Qline_spacing, it->object);
	  if (INTEGERP (lsp))
	    extra_line_spacing = XINT (lsp);
	  else if (FLOATP (lsp))
	    extra_line_spacing = (it->phys_ascent + it->phys_descent) * XFLOAT_DATA (lsp);
	}