# HG changeset patch
# User YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
# Date 1129631580 0
# Node ID 110356d4cc9becb2757c1dcb9fe9bed45b5d2036
# Parent  c8c3c8dbe33331bb8f3b54585c0aa8eb0550a34b
*** empty log message ***

diff -r c8c3c8dbe333 -r 110356d4cc9b lisp/ChangeLog.unicode
--- a/lisp/ChangeLog.unicode	Tue Oct 18 10:32:37 2005 +0000
+++ b/lisp/ChangeLog.unicode	Tue Oct 18 10:33:00 2005 +0000
@@ -1,3 +1,8 @@
+2005-10-18  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+	* term/mac-win.el: Delete the code to create a fontset from the X
+	resource "Font".
+
 2005-07-29  Naoto Takahashi  <ntakahas@m17n.org>
 
 	* international/robin.el (robin-define-package): Be sure to call
diff -r c8c3c8dbe333 -r 110356d4cc9b src/ChangeLog.unicode
--- a/src/ChangeLog.unicode	Tue Oct 18 10:32:37 2005 +0000
+++ b/src/ChangeLog.unicode	Tue Oct 18 10:33:00 2005 +0000
@@ -1,3 +1,12 @@
+2005-10-18  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+	* macterm.c (mac_encode_char): Call ccl_driver with the last arg
+	Qnil.  Use JIS_TO_SJIS instead of ENCODE_SJIS.
+	(decode_mac_font_name): Use decode_coding_c_string instead of
+	decode_coding.
+	(x_load_font): Initialize fontp->fontset to -1.  Set
+	fontp->encoding_type.
+
 2005-10-17  Kenichi Handa  <handa@m17n.org>
 
 	* search.c (search_buffer): Give up BM search on case-fold-search