From: Kim F. Storm <storm@cua.dk>
Date: Thu, 30 Dec 2004 18:07:07 +0000 (+0000)
Subject: (x_produce_glyphs): Fix last change.
X-Git-Tag: ttn-vms-21-2-B4~3046
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=29aa4ce71f71a79909478b024187f0567abe4d0e;p=emacs.git

(x_produce_glyphs): Fix last change.
---

diff --git a/src/xdisp.c b/src/xdisp.c
index 952c7110755..61ea98b37ef 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -19110,7 +19110,9 @@ x_produce_glyphs (it)
 
 	  height = get_line_height_property(it, Qline_height);
 	  /* Split (line-height total-height) list */
-	  if (CONSP (height) && CONSP (XCDR (height)))
+	  if (CONSP (height)
+	      && CONSP (XCDR (height))
+	      && NILP (XCDR (XCDR (height))))
 	    {
 	      total_height = XCAR (XCDR (height));
 	      height = XCAR (height);