From e6e818f6cfff580461d59e93402291892a731a15 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sun, 26 Jun 2022 19:55:13 +0300 Subject: [PATCH] Fix re-composition under 'composition-break-at-point' * src/xdisp.c (try_window_id): Disable this optimization if 'composition-break-at-point' is non-nil. --- src/xdisp.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/xdisp.c b/src/xdisp.c index cbe6feeae48..dec31760476 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -21192,6 +21192,12 @@ try_window_id (struct window *w) w->frame)))) GIVE_UP (24); + /* composition-break-at-point is incompatible with the optimizations + in this function, because we need to recompose characters when + point moves off their positions. */ + if (composition_break_at_point) + GIVE_UP (27); + /* Make sure beg_unchanged and end_unchanged are up to date. Do it only if buffer has really changed. The reason is that the gap is initially at Z for freshly visited files. The code below would -- 2.39.5