X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2FChangeLog;h=9c0809cf3732b5881fe70b9e4d16133cb81cc42e;hb=f651caac6f0ffdc0d17051a1a78f91686e9637a5;hp=5f9d6e850d928f75fbd600f7f970b2c6ec1d2470;hpb=1d2c5fccca49abed75f32ab8fb5b867258ce05b6;p=chise%2Fxemacs-chise.git

diff --git a/src/ChangeLog b/src/ChangeLog
index 5f9d6e8..9c0809c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,23 @@
 2000-04-27  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
 
+	* text-coding.c (Qdisable_composition): New variable; delete
+	`Qcomposite'.
+	(Fmake_coding_system): Add new property `disable-composite';
+	delete property `composite'.
+	(COMPOSE_ADD_CHAR): Use `CODING_SYSTEM_DISABLE_COMPOSITION'
+	instead of `!CODING_SYSTEM_COMPOSITE'.
+	(syms_of_file_coding): Add new symbol `disable-composition';
+	delete symbol `composite'.
+
+	* file-coding.h (struct Lisp_Coding_System): Add
+	`disable_composition'; delete `enable_composition'.
+	(CODING_SYSTEM_DISABLE_COMPOSITION): New macro; delete
+	`CODING_SYSTEM_COMPOSITE'.
+	(XCODING_SYSTEM_DISABLE_COMPOSITION): New macro; delete
+	`XCODING_SYSTEM_COMPOSITE'.
+
+2000-04-27  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
 	* mule-charset.c (vars_of_mule_charset): Update `utf-2000-version'
 	to 0.15.