From: Kenichi Handa <handa@m17n.org>
Date: Mon, 11 Mar 2002 11:28:41 +0000 (+0000)
Subject: (produce_chars): Set the variable `multibytep' correctly.
X-Git-Tag: emacs-pretest-23.0.90~8295^2~1864^2~939
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=71c8142642c6d74af67b1b99642881a79fccee97;p=emacs.git

(produce_chars): Set the variable `multibytep' correctly.
(decode_coding_gap): Set coding->dst_multibyte correctly.
---

diff --git a/src/coding.c b/src/coding.c
index 60b2d3658c9..bbfa9daaef1 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -5092,7 +5092,6 @@ produce_chars (coding)
     }
   else
     {
-      int multibytep = coding->src_multibyte;
       unsigned char *src = coding->source;
       unsigned char *src_end = src + coding->src_bytes;
       Lisp_Object eol_type;
@@ -5103,6 +5102,7 @@ produce_chars (coding)
 	{
 	  if (coding->src_multibyte)
 	    {
+	      int multibytep = 1;
 	      int consumed_chars;
 
 	      while (1)
@@ -5141,6 +5141,7 @@ produce_chars (coding)
 	  else
 	    while (src < src_end)
 	      {
+		int multibytep = 1;
 		int c = *src++;
 
 		if (c == '\r')
@@ -5706,6 +5707,7 @@ decode_coding_gap (coding, chars, bytes)
   coding->dst_object = coding->src_object;
   coding->dst_pos = PT;
   coding->dst_pos_byte = PT_BYTE;
+  coding->dst_multibyte = ! NILP (current_buffer->enable_multibyte_characters);
 
   if (CODING_REQUIRE_DETECTION (coding))
     detect_coding (coding);