summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>1999-07-07 22:49:31 +0000
committerRichard M. Stallman <rms@gnu.org>1999-07-07 22:49:31 +0000
commit237a6fd294b5e60a2971e02e79e49ec6ebad856c (patch)
tree5dda27e23ea93b0e34e829f7efe4ad0b93f73bb1
parent09494912d943df127880af3ae64128a9d8bcea1d (diff)
downloademacs-237a6fd294b5e60a2971e02e79e49ec6ebad856c.tar.gz
(Finsert_file_contents): If reading into a unibyte
buffer, suppress character code conversion.
-rw-r--r--src/fileio.c14
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.")
setup_coding_system (Fcheck_coding_system (val), &coding);
- if (NILP (Vcoding_system_for_read)
- && NILP (current_buffer->enable_multibyte_characters))
- /* We must suppress all text conversion except for end-of-line
- conversion. */
+ if (NILP (current_buffer->enable_multibyte_characters)
+ && ! NILP (val))
+ /* We must suppress all character code conversion except for
+ end-of-line conversion. */
setup_raw_text_coding_system (&coding);
coding_system_decided = 1;
@@ -4080,9 +4080,9 @@ actually used.")
bcopy (&temp_coding, &coding, sizeof coding);
}
- if (NILP (Vcoding_system_for_read)
- && NILP (current_buffer->enable_multibyte_characters))
- /* We must suppress all text conversion except for
+ if (NILP (current_buffer->enable_multibyte_characters)
+ && ! NILP (val))
+ /* We must suppress all character code conversion except for
end-of-line conversion. */
setup_raw_text_coding_system (&coding);
}