# HG changeset patch
# User Gerd Moellmann <gerd@gnu.org>
# Date 985974743 0
# Node ID d22db00cb35b372e660ee72130561cc543455043
# Parent  8ef9e303dac88d86f21f885d40328bca31938b70
(handle_display_prop): Fix recognition of subproperty
lists.

diff -r 8ef9e303dac8 -r d22db00cb35b src/xdisp.c
--- a/src/xdisp.c	Fri Mar 30 16:05:40 2001 +0000
+++ b/src/xdisp.c	Fri Mar 30 17:52:23 2001 +0000
@@ -2665,12 +2665,20 @@
     return HANDLED_NORMALLY;
 
   if (CONSP (prop)
-      && CONSP (XCAR (prop))
-      && !EQ (Qmargin, XCAR (XCAR (prop))))
-    {
-      /* A list of sub-properties.  */
+      /* Simple properties.  */
+      && !EQ (XCAR (prop), Qimage)
+      && !EQ (XCAR (prop), Qspace)
+      && !EQ (XCAR (prop), Qwhen)
+      && !EQ (XCAR (prop), Qspace_width)
+      && !EQ (XCAR (prop), Qheight)
+      && !EQ (XCAR (prop), Qraise)
+      /* Marginal area specifications.  */
+      && !(CONSP (XCAR (prop)) && EQ (XCAR (XCAR (prop)), Qmargin))
+      && !NILP (XCAR (prop)))
+    {
       for (; CONSP (prop); prop = XCDR (prop))
 	{
+	  debug_print (XCAR (prop));
 	  if (handle_single_display_prop (it, XCAR (prop), object,
 					  position, display_replaced_p))
 	    display_replaced_p = 1;