From: MORIOKA Tomohiko <tomo.git@chise.org>
Date: Thu, 8 Dec 2016 04:03:21 +0000 (+0900)
Subject: Sync up with master to merge `separate_cos_macro'.
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=68c3ae408f3af5f940a91b8a7d644ecc817b28e6;p=chise%2Fxemacs-chise.git-

Sync up with master to merge `separate_cos_macro'.
---

68c3ae408f3af5f940a91b8a7d644ecc817b28e6
diff --cc src/ChangeLog
index e873c4f,f8b7c0b..86cfff3
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,7 -1,7 +1,19 @@@
  2016-11-17  MORIOKA Tomohiko  <tomo.git@chise.org>
  
- 	* chartab.h: Use `USE_CONCORD_OBJECT_SYSTEM' instead of
- 	`HAVE_LIBCHISE' to detect to use Concord Object System.
++	* chartab.h: Undefine `USE_CONCORD_OBJECT_SYSTEM' to avoid the
++	Concord Object System.
++
++2016-11-16  MORIOKA Tomohiko  <tomo.git@chise.org>
++
++	* chartab.c (Fput_char_attribute): Use single-inheritance format
++	for character definitions; namely a value of `<-subsumptive' or
++	`<-denotational' must be a character instead of a list of
++	characters.
++
++2016-11-17  MORIOKA Tomohiko  <tomo.git@chise.org>
++
+ 	* chartab.h (USE_CONCORD_OBJECT_SYSTEM): New macro; use it instead
+ 	of `HAVE_LIBCHISE' to detect to use Concord Object System.
  	(USE_CONCORD_OBJECT_SYSTEM_TO_COMPOSE): New macro.
  
  	* text-coding.c: Use `USE_CONCORD_OBJECT_SYSTEM_TO_COMPOSE'