From: Kenichi Handa <handa@m17n.org>
Date: Tue, 14 May 2002 11:51:08 +0000 (+0000)
Subject: (Fset_buffer_multibyte): Convert 8-bit bytes to
X-Git-Tag: emacs-pretest-23.0.90~8295^2~1864^2~882
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8c2fc3113421adfb4db33064fc54569ffedfa6b5;p=emacs.git

(Fset_buffer_multibyte): Convert 8-bit bytes to
multibyte form correctly.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 6172430e19a..9a7a6bc650b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,11 +1,16 @@
 2002-05-14  Kenichi Handa  <handa@etl.go.jp>
 
+	* buffer.c (Fset_buffer_multibyte): Convert 8-bit bytes to
+	multibyte form correctly.
+
 	* fontset.c (fs_load_font): Check fontp->full_name (not fontname)
 	against Vfont_encoding_alist.
 
 	* coding.c (Fdecode_sjis_char): Fix typo (0x7F->0xFF).  Fix the
 	handling of charset list.
 	(encode_coding_iso_2022): Setup coding->safe_charsets in advance.
+	(decode_coding_object): Move point to coding->dst_pos before
+	calling post-read-conversion function.
 
 	* coding.h (JIS_TO_SJIS): Fix typo (j1->s1, j2->s2).
 
diff --git a/src/buffer.c b/src/buffer.c
index fd53972d6b1..b9c5c2acc52 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -2161,8 +2161,9 @@ but the contents viewed as characters do change.  */)
 	  else
 	    {
 	      unsigned char tmp[MAX_MULTIBYTE_LENGTH];
+	      int c = BYTE8_TO_CHAR (*p);
 
-	      bytes = CHAR_STRING (*p, tmp);
+	      bytes = CHAR_STRING (c, tmp);
 	      *p = tmp[0];
 	      TEMP_SET_PT_BOTH (pos + 1, pos + 1);
 	      bytes--;