[Emacs-diffs] /srv/bzr/emacs/trunk r106658: Fix bug #10263 with assertion violation using telugu-itrans input method.

[Eli Zaretskii]

------------------------------------------------------------
revno: 106658
fixes bug(s): http://debbugs.gnu.org/10263
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Sat 2011-12-10 21:54:45 +0200
message:
  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.
modified:
  src/ChangeLog
  src/xdisp.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-12-10 14:16:35 +0000
+++ b/src/ChangeLog     2011-12-10 19:54:45 +0000
@@ -1,3 +1,8 @@
+2011-12-10  Eli Zaretskii  <address@hidden>
+
+       * 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  <address@hidden>
 
        * nsterm.h (x_free_frame_resources): Declare.

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2011-12-09 18:40:42 +0000
+++ b/src/xdisp.c       2011-12-10 19:54:45 +0000
@@ -18887,7 +18887,8 @@
 #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));                     \