Fix display of box around images

* src/xdisp.c (face_before_or_after_it_pos): Handle correctly
when we are called with it->bidi_it.first_elt set.  (Bug#17114)

diff --git a/src/xdisp.c b/src/xdisp.c
index 6626fbcf63e7337b4a7c5f289d44b76d4a282ebb..95895ec3acb95012f8854ea4e1834ea65895acea 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -4359,6 +4359,11 @@ face_before_or_after_it_pos (struct it *it, bool before_p)
              int n = (it->what == IT_COMPOSITION ? it->cmp_it.nchars : 1);
 
              it_copy = *it;
+             /* If this is the first display element,
+                bidi_move_to_visually_next will deliver character at
+                current position without moving, so we need to enlarge N.  */
+             if (it->bidi_it.first_elt)
+               n++;
              while (n--)
                bidi_move_to_visually_next (&it_copy.bidi_it);
 
@@ -4461,6 +4466,11 @@ face_before_or_after_it_pos (struct it *it, bool before_p)
              int n = (it->what == IT_COMPOSITION ? it->cmp_it.nchars : 1);
 
              it_copy = *it;
+             /* If this is the first display element,
+                bidi_move_to_visually_next will deliver character at
+                current position without moving, so we need to enlarge N.  */
+             if (it->bidi_it.first_elt)
+               n++;
              while (n--)
                bidi_move_to_visually_next (&it_copy.bidi_it);