diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/callproc.c | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 42dede8e300..49e469b8c2f 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2011-11-11 Kenichi Handa <handa@m17n.org> + + * callproc.c (Fcall_process): Set the member dst_multibyte of + process_coding. + 2011-11-11 Johan Bockgård <bojohan@gnu.org> * xdisp.c (fill_composite_glyph_string): Always set s->face, to diff --git a/src/callproc.c b/src/callproc.c index 0859aaef2e6..01772efce30 100644 --- a/src/callproc.c +++ b/src/callproc.c @@ -712,6 +712,7 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS) */) /* If BUFFER is nil, we must read process output once and then discard it, so setup coding system but with nil. */ setup_coding_system (Qnil, &process_coding); + process_coding.dst_multibyte = 0; } else { @@ -747,6 +748,8 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS) */) && !NILP (val)) val = raw_text_coding_system (val); setup_coding_system (val, &process_coding); + process_coding.dst_multibyte + = ! NILP (BVAR (current_buffer, enable_multibyte_characters)); } process_coding.src_multibyte = 0; |