(x_produce_glyphs): Fix last change; handle newline in

header line strings.

diff --git a/src/xdisp.c b/src/xdisp.c
index 4993ae12fb91a90804953d0e32099f4ef0fe0b5f..2ef3722c080727db30c053f6df049c9376e3181a 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -18708,7 +18708,7 @@ x_produce_glyphs (it)
          it->pixel_width = 0;
          it->nglyphs = 0;
 
-         lh = Fget_text_property (IT_CHARPOS (*it), Qline_height, it->w->buffer);
+         lh = Fget_text_property (IT_CHARPOS (*it), Qline_height, it->object);
 
          if (EQ (lh, Qt))
            {
@@ -18760,7 +18760,7 @@ x_produce_glyphs (it)
                it->ascent = explicit_height - it->descent;
            }
 
-         lsp = Fget_text_property (IT_CHARPOS (*it), Qline_spacing, it->w->buffer);
+         lsp = Fget_text_property (IT_CHARPOS (*it), Qline_spacing, it->object);
          if (INTEGERP (lsp))
            extra_line_spacing = XINT (lsp);
          else if (FLOATP (lsp))