From ee3fe0b52165f446a5688112e9ccccaa75348ee6 Mon Sep 17 00:00:00 2001
From: YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
Date: Tue, 18 Oct 2005 10:33:00 +0000
Subject: [PATCH] *** empty log message ***

---
 lisp/ChangeLog.unicode | 5 +++++
 src/ChangeLog.unicode  | 9 +++++++++
 2 files changed, 14 insertions(+)

diff --git a/lisp/ChangeLog.unicode b/lisp/ChangeLog.unicode
index 51c563bba65..dbbf3ef9d97 100644
--- a/lisp/ChangeLog.unicode
+++ b/lisp/ChangeLog.unicode
@@ -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 --git a/src/ChangeLog.unicode b/src/ChangeLog.unicode
index 316ad751c09..d6a0b367578 100644
--- a/src/ChangeLog.unicode
+++ b/src/ChangeLog.unicode
@@ -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