1 files changed, 3 insertions, 1 deletions

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);