diff options
| author | Stefan Monnier | 2011-02-11 21:27:53 -0500 |
|---|---|---|
| committer | Stefan Monnier | 2011-02-11 21:27:53 -0500 |
| commit | c530e1c2a3a036d71942c354ba11b30a06341fd7 (patch) | |
| tree | 184fa6b6c9bb58855aa9f1ae6cded97edc4f10fb /src/coding.c | |
| parent | 295fb2ac59b66c0e2470325a42c8e58c135ed044 (diff) | |
| parent | e0e36cac4adaa32ad755a34c811366dd8e4655bc (diff) | |
| download | emacs-c530e1c2a3a036d71942c354ba11b30a06341fd7.tar.gz emacs-c530e1c2a3a036d71942c354ba11b30a06341fd7.zip | |
Merge from trunk
Diffstat (limited to 'src/coding.c')
| -rw-r--r-- | src/coding.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/coding.c b/src/coding.c index 3a3ba11ee9d..a9f16de56f3 100644 --- a/src/coding.c +++ b/src/coding.c | |||
| @@ -7880,7 +7880,7 @@ encode_coding_object (struct coding_system *coding, | |||
| 7880 | else if (BUFFERP (src_object)) | 7880 | else if (BUFFERP (src_object)) |
| 7881 | insert_from_buffer (XBUFFER (src_object), from, chars, 0); | 7881 | insert_from_buffer (XBUFFER (src_object), from, chars, 0); |
| 7882 | else | 7882 | else |
| 7883 | insert_1_both (coding->source + from, chars, bytes, 0, 0, 0); | 7883 | insert_1_both ((char *) coding->source + from, chars, bytes, 0, 0, 0); |
| 7884 | 7884 | ||
| 7885 | if (EQ (src_object, dst_object)) | 7885 | if (EQ (src_object, dst_object)) |
| 7886 | { | 7886 | { |