From: Eli Zaretskii <eliz@gnu.org>
Date: Mon, 7 Jan 2002 21:17:32 +0000 (+0000)
Subject: (send_process): Set src_multibyte to 1 after the call
X-Git-Tag: ttn-vms-21-2-B4~17266
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=fbb70ad9e6e00f3f146b50d3bf433a6ec6ce26c9;p=emacs.git

(send_process): Set src_multibyte to 1 after the call
top setup_coding_system, not before the call.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 604695251c6..9461a3285fc 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2002-01-07  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* process.c (send_process): Set src_multibyte to 1 after the call
+	top setup_coding_system, not before the call.
+
 2002-01-07  Jason Rumney  <jasonr@gnu.org>
 
 	* xmenu.c (set_frame_menubar, xmenu_show):
diff --git a/src/process.c b/src/process.c
index e9f7c59936c..56d3a67e8d1 100644
--- a/src/process.c
+++ b/src/process.c
@@ -3276,15 +3276,17 @@ send_process (proc, buf, len, object)
 	  && !NILP (XBUFFER (object)->enable_multibyte_characters))
       || EQ (object, Qt))
     {
-      coding->src_multibyte = 1;
       if (!EQ (coding->symbol, XPROCESS (proc)->encode_coding_system))
 	/* The coding system for encoding was changed to raw-text
 	   because we sent a unibyte text previously.  Now we are
 	   sending a multibyte text, thus we must encode it by the
 	   original coding system specified for the current
 	   process.  */
-	setup_coding_system (XPROCESS (proc)->encode_coding_system,
-			     coding);
+	setup_coding_system (XPROCESS (proc)->encode_coding_system, coding);
+      /* src_multibyte should be set to 1 _after_ a call to
+	 setup_coding_system, since it resets src_multibyte to
+	 zero.  */
+      coding->src_multibyte = 1;
     }
   else
     {