aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2025-08-25 20:44:36 +0300
committerEli Zaretskii2025-08-25 20:44:36 +0300
commitf884b1acef5e053fa33b2ebd3bce100fe643d71a (patch)
treeb482d99b0bbdf3f1c43c3d8bc88b43c9d7929891 /src
parent0c49f5917fdd46a8f34181e66b3c11a8657d6bf2 (diff)
downloademacs-f884b1acef5e053fa33b2ebd3bce100fe643d71a.tar.gz
emacs-f884b1acef5e053fa33b2ebd3bce100fe643d71a.zip
Fix assertion violations caused by recent redisplay changes
* src/xdisp.c (push_it): Don't rest the string_from_prefix_prop_p flag. (Bug#79304)
Diffstat (limited to 'src')
-rw-r--r--src/xdisp.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/xdisp.c b/src/xdisp.c
index 4f6acb84bbf..6411fd23335 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -7261,8 +7261,6 @@ push_it (struct it *it, struct text_pos *position)
7261 p->from_disp_prop_p = it->from_disp_prop_p; 7261 p->from_disp_prop_p = it->from_disp_prop_p;
7262 ++it->sp; 7262 ++it->sp;
7263 7263
7264 it->string_from_prefix_prop_p = false;
7265
7266 /* Save the state of the bidi iterator as well. */ 7264 /* Save the state of the bidi iterator as well. */
7267 if (it->bidi_p) 7265 if (it->bidi_p)
7268 bidi_push_it (&it->bidi_it); 7266 bidi_push_it (&it->bidi_it);