Mercurial > emacs

changeset 37105:d22db00cb35b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(handle_display_prop): Fix recognition of subproperty lists.
author Gerd Moellmann <gerd@gnu.org>
date Fri, 30 Mar 2001 17:52:23 +0000
parents 8ef9e303dac8
children 3fd2176c610c
files src/xdisp.c
diffstat 1 files changed, 12 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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;