From: Kenichi Handa <handa@m17n.org>
Date: Thu, 7 Sep 2000 01:14:20 +0000 (+0000)
Subject: (read_process_output): Before inserting the decoded
X-Git-Tag: emacs-pretest-21.0.90~1768
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d69864bf3ee0b990101fee34f3dc857cf3f13ea4;p=emacs.git

(read_process_output): Before inserting the decoded
text in the buffer, adjust the multibyteness.
---

diff --git a/src/process.c b/src/process.c
index 35fca18ff28..49dcaea467c 100644
--- a/src/process.c
+++ b/src/process.c
@@ -3075,6 +3075,12 @@ read_process_output (proc, channel)
       bcopy (chars + coding->consumed, XSTRING (p->decoding_buf)->data,
 	     carryover);
       XSETINT (p->decoding_carryover, carryover);
+      /* Adjust the multibyteness of TEXT to that of the buffer.  */
+      if (NILP (current_buffer->enable_multibyte_characters)
+	  != ! STRING_MULTIBYTE (text))
+	text = (STRING_MULTIBYTE (text)
+		? Fstring_as_unibyte (text)
+		: Fstring_as_multibyte (text));
       nbytes = STRING_BYTES (XSTRING (text));
       nchars = XSTRING (text)->size;
       insert_from_string_before_markers (text, 0, 0, nchars, nbytes, 0);