From: Eli Zaretskii <eliz@gnu.org>
Date: Sun, 31 Jan 2016 16:10:12 +0000 (+0200)
Subject: Fix display of overlay strings with 'display' and 'box' property
X-Git-Tag: emacs-25.0.91~138
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a8273da;p=emacs.git

Fix display of overlay strings with 'display' and 'box' property

* src/xdisp.c (get_next_display_element): Take the box face from
display stack level that comes from a buffer, not an overlay
string.  (Bug#22499)
---

diff --git a/src/xdisp.c b/src/xdisp.c
index 78fddd60fc0..8f1e98d99ef 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -7234,14 +7234,23 @@ get_next_display_element (struct it *it)
 		     buffer position is stored in the 'position'
 		     member of the iteration stack slot below the
 		     current one, see handle_single_display_spec.  By
-		     contrast, it->current.pos was is not yet updated
+		     contrast, it->current.pos was not yet updated
 		     to point to that buffer position; that will
 		     happen in pop_it, after we finish displaying the
 		     current string.  Note that we already checked
 		     above that it->sp is positive, so subtracting one
 		     from it is safe.  */
 		  if (it->from_disp_prop_p)
-		    pos = (it->stack + it->sp - 1)->position;
+		    {
+		      int stackp = it->sp - 1;
+
+		      /* Find the stack level with data from buffer.  */
+		      while (stackp >= 0
+			     && STRINGP ((it->stack + stackp)->string))
+			stackp--;
+		      eassert (stackp >= 0);
+		      pos = (it->stack + stackp)->position;
+		    }
 		  else
 		    INC_TEXT_POS (pos, it->multibyte_p);