2 files changed, 14 insertions, 3 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index a8fdc669f2d..b97085a2b12 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2001-03-30  Gerd Moellmann  <gerd@gnu.org>
 
+        * xdisp.c (handle_display_prop): Fix recognition of subproperty
+        lists.
+        
         * xdisp.c (reseat_to_string): Undo last change.
 
         * dispnew.c (adjust_glyph_matrix): Don't try to reuse the current
diff --git a/src/xdisp.c b/src/xdisp.c
index ca57381d21c..294ee2a1334 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -2665,12 +2665,20 @@ handle_display_prop (it)
     return HANDLED_NORMALLY;
 
   if (CONSP (prop)
-      && CONSP (XCAR (prop))
-      && !EQ (Qmargin, XCAR (XCAR (prop))))
+      /* 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)))
     {
-      /* A list of sub-properties.  */
       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;