diff options
| author | Karoly Lorentey | 2006-05-20 10:32:11 +0000 |
|---|---|---|
| committer | Karoly Lorentey | 2006-05-20 10:32:11 +0000 |
| commit | aabd1a8b138a7f5907c3bb0bbd40932fa7b8e9fe (patch) | |
| tree | 7db1ed5481ec4ec6b43271d0ea57c032c22f60fc /src/callproc.c | |
| parent | 9f97e26d01003a17b861505d535c89ad73799b7e (diff) | |
| parent | 689840b9224725a0beae741aaaa325d7edb2244c (diff) | |
| download | emacs-aabd1a8b138a7f5907c3bb0bbd40932fa7b8e9fe.tar.gz emacs-aabd1a8b138a7f5907c3bb0bbd40932fa7b8e9fe.zip | |
Merged from emacs@sv.gnu.org
Patches applied:
* emacs@sv.gnu.org/emacs--devo--0--patch-285
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-286
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-287
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-288
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-102
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-558
Diffstat (limited to 'src/callproc.c')
| -rw-r--r-- | src/callproc.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/callproc.c b/src/callproc.c index 25c79bf926c..fb187d757d5 100644 --- a/src/callproc.c +++ b/src/callproc.c | |||
| @@ -302,6 +302,8 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS) */) | |||
| 302 | val = Qnil; | 302 | val = Qnil; |
| 303 | } | 303 | } |
| 304 | setup_coding_system (Fcheck_coding_system (val), &argument_coding); | 304 | setup_coding_system (Fcheck_coding_system (val), &argument_coding); |
| 305 | if (argument_coding.common_flags & CODING_ASCII_INCOMPATIBLE_MASK) | ||
| 306 | setup_coding_system (Qraw_text, &argument_coding); | ||
| 305 | if (argument_coding.eol_type == CODING_EOL_UNDECIDED) | 307 | if (argument_coding.eol_type == CODING_EOL_UNDECIDED) |
| 306 | argument_coding.eol_type = system_eol_type; | 308 | argument_coding.eol_type = system_eol_type; |
| 307 | } | 309 | } |