From: Eli Zaretskii <eliz@gnu.org>
Date: Wed, 6 Feb 2002 18:50:33 +0000 (+0000)
Subject: (code_convert_region): Update coding->cmp_data->char_offset
X-Git-Tag: emacs-21.2~110
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0f888e66f337109dd876f49d4139a8d002cd756e;p=emacs.git

(code_convert_region): Update coding->cmp_data->char_offset
before calling decode_coding.
---

diff --git a/src/coding.c b/src/coding.c
index 48201ed921c..2e3411838a8 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -5522,7 +5522,11 @@ code_convert_region (from, from_byte, to, to_byte, coding, encodep, replace)
       if (encodep)
 	result = encode_coding (coding, src, dst, len_byte, 0);
       else
-	result = decode_coding (coding, src, dst, len_byte, 0);
+	{
+	  if (coding->composing != COMPOSITION_DISABLED)
+	    coding->cmp_data->char_offset = from + inserted;
+	  result = decode_coding (coding, src, dst, len_byte, 0);
+	}
 
       /* The buffer memory is now:
 	 +--------+-------converted-text----+--+------original-text----+---+