diff options
| author | Kenichi Handa | 2006-05-08 07:56:14 +0000 |
|---|---|---|
| committer | Kenichi Handa | 2006-05-08 07:56:14 +0000 |
| commit | 76a25e793682c3c59084c99b5577443bbd786a41 (patch) | |
| tree | c567be4197c86e1937157f413029a393d95a98fe /src | |
| parent | 3f0b133f7662e6280b357b0fcf6031f953e16b58 (diff) | |
| download | emacs-76a25e793682c3c59084c99b5577443bbd786a41.tar.gz emacs-76a25e793682c3c59084c99b5577443bbd786a41.zip | |
(Fcall_process): Use system_eol_type for encoding
arguments if eol_type is not yet decided.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 23 | ||||
| -rw-r--r-- | src/callproc.c | 2 |
2 files changed, 25 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 91b9594efa8..9ae27eadf12 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,26 @@ | |||
| 1 | 2006-05-08 Kenichi Handa <handa@m17n.org> | ||
| 2 | |||
| 3 | * callproc.c (Fcall_process): Use system_eol_type for encoding | ||
| 4 | arguments if eol_type is not yet decided. | ||
| 5 | |||
| 6 | * coding.h (system_eol_type): Extern it. | ||
| 7 | |||
| 8 | * coding.c (setup_coding_system): For invalid coding-system, set | ||
| 9 | coding->eol_type to CODING_EOL_UNDECIDED. | ||
| 10 | (encode_coding): Cancel previous change. | ||
| 11 | (shrink_encoding_region): Likewise. | ||
| 12 | (code_convert_region1): Likewise. | ||
| 13 | (code_convert_string1): Likewise. | ||
| 14 | (code_convert_string_norecord): Likewise. | ||
| 15 | |||
| 16 | * fileio.c (choose_write_coding_system): Use system_eol_type for | ||
| 17 | encoding if eol_type is not yet decided. | ||
| 18 | |||
| 19 | * process.c (setup_process_coding_systems): Use system_eol_type | ||
| 20 | for encoding if eol_type is not yet decided. | ||
| 21 | (read_process_output): Likewise. | ||
| 22 | (send_process): Likewise. | ||
| 23 | |||
| 1 | 2006-05-07 Juanma Barranquero <lekktu@gmail.com> | 24 | 2006-05-07 Juanma Barranquero <lekktu@gmail.com> |
| 2 | 25 | ||
| 3 | * minibuf.c (syms_of_minibuf) <history-length>: Fix typo in doc. | 26 | * minibuf.c (syms_of_minibuf) <history-length>: Fix typo in doc. |
diff --git a/src/callproc.c b/src/callproc.c index 9f90e9d7537..8cf261c646f 100644 --- a/src/callproc.c +++ b/src/callproc.c | |||
| @@ -295,6 +295,8 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS) */) | |||
| 295 | val = Qnil; | 295 | val = Qnil; |
| 296 | } | 296 | } |
| 297 | setup_coding_system (Fcheck_coding_system (val), &argument_coding); | 297 | setup_coding_system (Fcheck_coding_system (val), &argument_coding); |
| 298 | if (argument_coding.eol_type == CODING_EOL_UNDECIDED) | ||
| 299 | argument_coding.eol_type = system_eol_type; | ||
| 298 | } | 300 | } |
| 299 | } | 301 | } |
| 300 | 302 | ||