]> git.eshelyaron.com Git - emacs.git/commitdiff
Fix min-width problem with "overlapping" regions
authorLars Ingebrigtsen <larsi@gnus.org>
Wed, 24 Nov 2021 19:04:25 +0000 (20:04 +0100)
committerLars Ingebrigtsen <larsi@gnus.org>
Wed, 24 Nov 2021 19:10:17 +0000 (20:10 +0100)
* src/xdisp.c (handle_display_prop): Fix problem with overlapping
regions.

src/xdisp.c

index a0efefa3a52120e51e0f99e5dba79da9804a6491..b7fd2249dc22d4dcc094797b8d04b189c2bcdd40 100644 (file)
@@ -5352,7 +5352,8 @@ handle_display_prop (struct it *it)
                                           Qdisplay, object, &overlay);
 
   /* Handle min-width ends. */
-  if (!NILP (it->min_width_property))
+  if (!NILP (it->min_width_property)
+      && NILP (find_display_property (propval, Qmin_width)))
     display_min_width (it, bufpos, object, Qnil);
 
   if (NILP (propval))