Merge from trunk

[bpt/emacs.git] / src / coding.c

diff --git a/src/coding.c b/src/coding.c
index 3a3ba11..a9f16de 100644 (file)
--- a/src/coding.c
+++ b/src/coding.c
@@ -7880,7 +7880,7 @@ encode_coding_object (struct coding_system *coding,
       else if (BUFFERP (src_object))
        insert_from_buffer (XBUFFER (src_object), from, chars, 0);
       else
-       insert_1_both (coding->source + from, chars, bytes, 0, 0, 0);
+       insert_1_both ((char *) coding->source + from, chars, bytes, 0, 0, 0);
 
       if (EQ (src_object, dst_object))
        {