diff options
| author | Richard M. Stallman | 1999-07-07 22:49:31 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1999-07-07 22:49:31 +0000 |
| commit | 237a6fd294b5e60a2971e02e79e49ec6ebad856c (patch) | |
| tree | 5dda27e23ea93b0e34e829f7efe4ad0b93f73bb1 | |
| parent | 09494912d943df127880af3ae64128a9d8bcea1d (diff) | |
| download | emacs-237a6fd294b5e60a2971e02e79e49ec6ebad856c.tar.gz emacs-237a6fd294b5e60a2971e02e79e49ec6ebad856c.zip | |
(Finsert_file_contents): If reading into a unibyte
buffer, suppress character code conversion.
| -rw-r--r-- | src/fileio.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/fileio.c b/src/fileio.c index 702d9ac1299..84defeb05d5 100644 --- a/src/fileio.c +++ b/src/fileio.c | |||
| @@ -3539,10 +3539,10 @@ actually used.") | |||
| 3539 | 3539 | ||
| 3540 | setup_coding_system (Fcheck_coding_system (val), &coding); | 3540 | setup_coding_system (Fcheck_coding_system (val), &coding); |
| 3541 | 3541 | ||
| 3542 | if (NILP (Vcoding_system_for_read) | 3542 | if (NILP (current_buffer->enable_multibyte_characters) |
| 3543 | && NILP (current_buffer->enable_multibyte_characters)) | 3543 | && ! NILP (val)) |
| 3544 | /* We must suppress all text conversion except for end-of-line | 3544 | /* We must suppress all character code conversion except for |
| 3545 | conversion. */ | 3545 | end-of-line conversion. */ |
| 3546 | setup_raw_text_coding_system (&coding); | 3546 | setup_raw_text_coding_system (&coding); |
| 3547 | 3547 | ||
| 3548 | coding_system_decided = 1; | 3548 | coding_system_decided = 1; |
| @@ -4080,9 +4080,9 @@ actually used.") | |||
| 4080 | bcopy (&temp_coding, &coding, sizeof coding); | 4080 | bcopy (&temp_coding, &coding, sizeof coding); |
| 4081 | } | 4081 | } |
| 4082 | 4082 | ||
| 4083 | if (NILP (Vcoding_system_for_read) | 4083 | if (NILP (current_buffer->enable_multibyte_characters) |
| 4084 | && NILP (current_buffer->enable_multibyte_characters)) | 4084 | && ! NILP (val)) |
| 4085 | /* We must suppress all text conversion except for | 4085 | /* We must suppress all character code conversion except for |
| 4086 | end-of-line conversion. */ | 4086 | end-of-line conversion. */ |
| 4087 | setup_raw_text_coding_system (&coding); | 4087 | setup_raw_text_coding_system (&coding); |
| 4088 | } | 4088 | } |