From: MORIOKA Tomohiko <tomo.git@chise.org>
Date: Thu, 8 Jun 2017 19:12:31 +0000 (+0900)
Subject: Merge branch 'master' into single-inheritance.
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=497cc6325525caedf9c4e352edd7721ba74fe932;p=chise%2Fxemacs-chise.git-

Merge branch 'master' into single-inheritance.
---

497cc6325525caedf9c4e352edd7721ba74fe932
diff --cc src/ChangeLog
index 86cfff3,764402a..97d3c0c
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,17 -1,9 +1,21 @@@
+ 2017-06-08  MORIOKA Tomohiko  <tomo.git@chise.org>
+ 
+ 	* char-ucs.h (MAX_LEADING_BYTE_PRIVATE): Use 1024 instead of 512.
+ 
  2016-11-17  MORIOKA Tomohiko  <tomo.git@chise.org>
  
 +	* 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.