aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenichi Handa2011-11-11 17:09:40 +0900
committerKenichi Handa2011-11-11 17:09:40 +0900
commit659afedebb2cdd864fee5f33c7e32eef7bc76cdf (patch)
tree2730a33f173121a497dd3d23703a3bfe02213560
parent0756b0c3a6e60dd623da6f12bc8d2de05ef7b8f1 (diff)
downloademacs-659afedebb2cdd864fee5f33c7e32eef7bc76cdf.tar.gz
emacs-659afedebb2cdd864fee5f33c7e32eef7bc76cdf.zip
callproc.c (Fcall_process): Set the member dst_multibyte of process_coding.
-rw-r--r--src/ChangeLog5
-rw-r--r--src/callproc.c3
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 @@
12011-11-11 Kenichi Handa <handa@m17n.org>
2
3 * callproc.c (Fcall_process): Set the member dst_multibyte of
4 process_coding.
5
12011-11-11 Johan Bockgård <bojohan@gnu.org> 62011-11-11 Johan Bockgård <bojohan@gnu.org>
2 7
3 * xdisp.c (fill_composite_glyph_string): Always set s->face, to 8 * 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) */)
712 /* If BUFFER is nil, we must read process output once and then 712 /* If BUFFER is nil, we must read process output once and then
713 discard it, so setup coding system but with nil. */ 713 discard it, so setup coding system but with nil. */
714 setup_coding_system (Qnil, &process_coding); 714 setup_coding_system (Qnil, &process_coding);
715 process_coding.dst_multibyte = 0;
715 } 716 }
716 else 717 else
717 { 718 {
@@ -747,6 +748,8 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS) */)
747 && !NILP (val)) 748 && !NILP (val))
748 val = raw_text_coding_system (val); 749 val = raw_text_coding_system (val);
749 setup_coding_system (val, &process_coding); 750 setup_coding_system (val, &process_coding);
751 process_coding.dst_multibyte
752 = ! NILP (BVAR (current_buffer, enable_multibyte_characters));
750 } 753 }
751 process_coding.src_multibyte = 0; 754 process_coding.src_multibyte = 0;
752 755