upstream

2 files changed, 12 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 243a39af45d..e3cf7546962 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2011-08-22  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (BUFFER_POS_REACHED_P): If this is a composition,
+        consider it a hit if to_charpos is anywhere in the range of the
+        composed buffer positions.
+
 2011-08-22  Chong Yidong  <cyd@stupidchicken.com>
 
         * image.c (gif_load): Don't assume that each subimage has the same
diff --git a/src/xdisp.c b/src/xdisp.c
index 2cd1bb9bfdb..5ce8cbf8d9b 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -7753,7 +7753,12 @@ move_it_in_display_line_to (struct it *it,
   ((op & MOVE_TO_POS) != 0                                      \
    && BUFFERP (it->object)                                      \
    && (IT_CHARPOS (*it) == to_charpos                           \
-       || (!it->bidi_p && IT_CHARPOS (*it) > to_charpos))       \
+       || (!it->bidi_p && IT_CHARPOS (*it) > to_charpos)        \
+       || (it->what == IT_COMPOSITION                           \
+           && ((IT_CHARPOS (*it) > to_charpos                   \
+                && to_charpos >= it->cmp_it.charpos)            \
+               || (IT_CHARPOS (*it) < to_charpos                \
+                   && to_charpos <= it->cmp_it.charpos))))      \
    && (it->method == GET_FROM_BUFFER                            \
        || (it->method == GET_FROM_DISPLAY_VECTOR                \
            && it->dpvec + it->current.dpvec_index + 1 >= it->dpend)))