Fix bug #10263 with assertion violation using telugu-itrans input method.

 src/xdisp.c (RECORD_MAX_MIN_POS): Use IT->cmp_it.charpos only if
 IT->string is nil.

diff --git a/src/ChangeLog b/src/ChangeLog
index 2e1a3b19b1d0ecf5e9a617eec66ccbbbcf865a59..94db6c686056b85030e309e3f88e829402fb3106 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2011-12-10  Eli Zaretskii  <eliz@gnu.org>
+
+       * xdisp.c (RECORD_MAX_MIN_POS): Use IT->cmp_it.charpos only if
+       IT->string is nil.  (Bug#10263)
+
 2011-12-10  Jan Djärv  <jan.h.d@swipnet.se>
 
        * nsterm.h (x_free_frame_resources): Declare.

diff --git a/src/xdisp.c b/src/xdisp.c
index 87bbded9208b773b015163d56eb4ea4cef791074..41d393a65a75f4222935a309a48314d41e03bce7 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -18887,7 +18887,8 @@ display_line (struct it *it)
 #define RECORD_MAX_MIN_POS(IT)                                 \
   do                                                           \
     {                                                          \
-      int composition_p = (IT)->what == IT_COMPOSITION;                \
+      int composition_p = !STRINGP ((IT)->string)              \
+       && ((IT)->what == IT_COMPOSITION);                      \
       EMACS_INT current_pos =                                  \
        composition_p ? (IT)->cmp_it.charpos                    \
                      : IT_CHARPOS (*(IT));                     \