From: Gerd Moellmann <gerd@gnu.org>
Date: Tue, 7 Sep 1999 22:31:38 +0000 (+0000)
Subject: (handle_single_display_prop): Change conditional
X-Git-Tag: emacs-pretest-21.0.90~6844
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5a4c88c4f417acde163837a4d2fb670b8c58bcf9;p=emacs.git

(handle_single_display_prop): Change conditional
display property to `:when FORM . VALUE'.
---

diff --git a/src/xdisp.c b/src/xdisp.c
index a816c064b49..d02a3422980 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -2297,8 +2297,8 @@ handle_single_display_prop (it, prop, object, position)
 
   Lisp_Object form;
 
-  /* If PROP is a list of the form `(:when FORM VALUE)', FORM is
-     evaluated.  If the result is nil, VALUE is ignored.  */
+  /* If PROP is a list of the form `(:when FORM . VALUE)', FORM is
+     evaluated.  If the result is nil, VALUE is ignored. */
   form = Qt;
   if (CONSP (prop) && EQ (XCAR (prop), QCwhen))
     {
@@ -2307,9 +2307,6 @@ handle_single_display_prop (it, prop, object, position)
 	return 0;
       form = XCAR (prop);
       prop = XCDR (prop);
-      if (!CONSP (prop))
-	return 0;
-      prop = XCAR (prop);
     }
 
   if (!NILP (form) && !EQ (form, Qt))