From: Pip Cet <pipcet@gmail.com>
Date: Sun, 31 May 2020 16:58:19 +0000 (+0000)
Subject: Avoid losing composition state in handle_stop_backwards
X-Git-Tag: emacs-28.0.90~7224
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0bfc4b3dd36a415f118b4b67bfacf99efd6f28c5;p=emacs.git

Avoid losing composition state in handle_stop_backwards

* src/xdisp.c (handle_stop_backwards): Save composition iterator state
across our forward scan.  (Bug#41626)
---

diff --git a/src/xdisp.c b/src/xdisp.c
index 0f06a38d405..f65c3ebcd2f 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -8692,6 +8692,7 @@ handle_stop_backwards (struct it *it, ptrdiff_t charpos)
   ptrdiff_t where_we_are = (bufp ? IT_CHARPOS (*it) : IT_STRING_CHARPOS (*it));
   struct display_pos save_current = it->current;
   struct text_pos save_position = it->position;
+  struct composition_it save_cmp_it = it->cmp_it;
   struct text_pos pos1;
   ptrdiff_t next_stop;
 
@@ -8719,6 +8720,7 @@ handle_stop_backwards (struct it *it, ptrdiff_t charpos)
   it->bidi_p = true;
   it->current = save_current;
   it->position = save_position;
+  it->cmp_it = save_cmp_it;
   next_stop = it->stop_charpos;
   it->stop_charpos = it->prev_stop;
   handle_stop (it);