From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Wed, 24 Nov 2021 19:04:25 +0000 (+0100)
Subject: Fix min-width problem with "overlapping" regions
X-Git-Tag: emacs-29.0.90~2852^2~55
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=833a42fbcf78ec99b84a98dd6bc7c2eea6eeaef6;p=emacs.git

Fix min-width problem with "overlapping" regions

* src/xdisp.c (handle_display_prop): Fix problem with overlapping
regions.
---

diff --git a/src/xdisp.c b/src/xdisp.c
index a0efefa3a52..b7fd2249dc2 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -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))