From: Kenichi Handa <handa@m17n.org>
Date: Fri, 15 Dec 2000 08:30:40 +0000 (+0000)
Subject: (detect_coding): Call detect_coding_mask with a correct MULTIBYTEP
X-Git-Tag: emacs-pretest-21.0.95~498
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=64c1e55fbe411abb6186fe6d973bf8cd789fb3a1;p=emacs.git

(detect_coding): Call detect_coding_mask with a correct MULTIBYTEP
argument.
(code_convert_region): Don't override coding->src_multibyte and
coding->dst_multibyte.
---

diff --git a/src/coding.c b/src/coding.c
index 41e4eb1a8e1..18958564e52 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -3690,7 +3690,8 @@ detect_coding (coding, src, src_bytes)
   Lisp_Object val;
 
   val = Vcoding_category_list;
-  mask = detect_coding_mask (src, src_bytes, coding_priorities, &skip, 0);
+  mask = detect_coding_mask (src, src_bytes, coding_priorities, &skip,
+			     coding->src_multibyte);
   coding->heading_ascii = skip;
 
   if (!mask) return;
@@ -4832,9 +4833,6 @@ code_convert_region (from, from_byte, to, to_byte, coding, encodep, replace)
   int prev_Z;
   int multibyte_p = !NILP (current_buffer->enable_multibyte_characters);
 
-  coding->src_multibyte = replace && multibyte_p;
-  coding->dst_multibyte = multibyte_p;
-
   deletion = Qnil;
   saved_coding_symbol = Qnil;