changeset 25598:709e9cdaaab1

(handle_single_display_prop): Change conditional display property to `:when FORM . VALUE'.
author Gerd Moellmann <gerd@gnu.org>
date Tue, 07 Sep 1999 22:31:38 +0000
parents 16a9c3c6f90e
children 34282f1ae111
files src/xdisp.c
diffstat 1 files changed, 2 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/xdisp.c	Tue Sep 07 19:40:09 1999 +0000
+++ b/src/xdisp.c	Tue Sep 07 22:31:38 1999 +0000
@@ -2297,8 +2297,8 @@
 
   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 @@
 	return 0;
       form = XCAR (prop);
       prop = XCDR (prop);
-      if (!CONSP (prop))
-	return 0;
-      prop = XCAR (prop);
     }
 
   if (!NILP (form) && !EQ (form, Qt))