From b73189c64fa97828b5525f24d0c784a050487eb7 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 10 Dec 2011 21:54:45 +0200 Subject: [PATCH] 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. --- src/ChangeLog | 5 +++++ src/xdisp.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index 2e1a3b19b1d..94db6c68605 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2011-12-10 Eli Zaretskii + + * 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 * nsterm.h (x_free_frame_resources): Declare. diff --git a/src/xdisp.c b/src/xdisp.c index 87bbded9208..41d393a65a7 100644 --- 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)); \ -- 2.11.4.GIT