From 9ca93f50c75edcd8f0643621232ea03534766c32 Mon Sep 17 00:00:00 2001
From: tomo <tomo>
Date: Sun, 24 Oct 2010 18:08:08 +0000
Subject: [PATCH] update.

---
 src/ChangeLog |   20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/src/ChangeLog b/src/ChangeLog
index 8e9def4..74888eb 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,23 @@
+2010-09-15  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* concord.c: Include <chise.h> if HAVE_LIBCHISE is defined.
+	(Qcharacter): New variable when HAVE_LIBCHISE is defined.
+	(Qfeature): Ditto.
+	(Fconcord_object_genre): New function.
+	(syms_of_concord):
+	- Add new builtin symbols `character' and `feature' when
+	  HAVE_LIBCHISE is defined.
+	- Add Add new builtin function `concord-object-genre'.	
+	(complex_vars_of_concord): New function; assign genres `character'
+	and `feature' when HAVE_LIBCHISE is defined.
+
+2010-09-14  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* emacs.c (main_1): Call `complex_vars_of_concord' when
+	HAVE_CONCORD is defined.
+
+	* symsinit.h (complex_vars_of_concord): New prototype.
+
 2010-07-01  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
 
 	* chartab.c (allocate_character): Add `static'.
-- 
1.7.10.4