From: Eli Zaretskii <eliz@gnu.org>
Date: Mon, 7 Jan 2002 21:21:51 +0000 (+0000)
Subject: (send_process): Set src_multibyte to 1 after the call
X-Git-Tag: emacs-21.2~201
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c693cc85e8ec705fc89495af55b61b02f9a128e1;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 a7ea1c3b593..74339e14eff 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-05  Jason Rumney  <jasonr@gnu.org>
 
 	* w32term.c (x_draw_glyphs): Don't call notice_overwritten_cursor
diff --git a/src/process.c b/src/process.c
index 474b21f2476..d1ad9c7d5d5 100644
--- a/src/process.c
+++ b/src/process.c
@@ -3276,7 +3276,6 @@ 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
@@ -3285,6 +3284,10 @@ send_process (proc, buf, len, object)
 	   process.  */
 	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
     {