--- generic/tclEncoding.c~	Tue Sep 25 06:10:32 2001
+++ generic/tclEncoding.c	Wed Oct 24 11:50:43 2001
@@ -2504,9 +2504,12 @@
 	memcpy((VOID *) dst, (VOID *) dataPtr->init,
 		(size_t) dataPtr->initLen);
 	dst += dataPtr->initLen;
-	memcpy((VOID *) dst, (VOID *) dataPtr->subTables[0].sequence,
-		(size_t) len);
-	dst += len;
+	/* This initial escape sequence does not requiered.
+         *                    2001/10/23 taguchi@tohoku.iij.ad.jp
+	  memcpy((VOID *) dst, (VOID *) dataPtr->subTables[0].sequence,
+		 (size_t) len);
+	  dst += len;
+	*/
     } else {
         state = (int) *statePtr;
     }
@@ -2594,8 +2597,17 @@
 	if (dst + dataPtr->finalLen > dstEnd) {
 	    result = TCL_CONVERT_NOSPACE;
 	} else {
+ 	   /* On the tail of string, we should escape to iso8859-1.
+            *                 2001/10/24 taguchi@tohoku.iij.ad.jp
+            */ 
+	    unsigned int len;
+
+	    len = dataPtr->subTables[0].sequenceLen;
+	    memcpy((VOID *) dst, (VOID *) dataPtr->subTables[0].sequence,
+		   (size_t) len);
+	    dst += len;
 	    memcpy((VOID *) dst, (VOID *) dataPtr->final,
-		    (size_t) dataPtr->finalLen);
+		   (size_t) dataPtr->finalLen);
 	    dst += dataPtr->finalLen;
 	}
     }
--- library/encoding/iso2022-jp.enc~	Fri Apr 16 09:47:07 1999
+++ library/encoding/iso2022-jp.enc	Wed Oct 24 11:12:38 2001
@@ -5,8 +5,8 @@
 final		{}
 iso8859-1	\x1b(B
 jis0201		\x1b(J
-jis0208		\x1b$@
 jis0208		\x1b$B
+jis0208		\x1b$@
 jis0212		\x1b$(D
 gb2312		\x1b$A
 ksc5601		\x1b$(C
