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.

diff --git a/src/xdisp.c b/src/xdisp.c
index cbe6feeae48633364718bbac49d7fb40c801ffed..dec3176047666a9030e210c81427031ad7b50b82 100644 (file)
--- 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