# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 973514414 0
# Node ID 6adb10eaeaa83525f85ce8d88f641babee1f5800
# Parent  421e3db4e24e866e6af6782542a55385f94d8662
*** empty log message ***

diff -r 421e3db4e24e -r 6adb10eaeaa8 lisp/ChangeLog
--- a/lisp/ChangeLog	Mon Nov 06 12:36:06 2000 +0000
+++ b/lisp/ChangeLog	Mon Nov 06 12:40:14 2000 +0000
@@ -1,3 +1,9 @@
+2000-11-06  Kenichi Handa  <handa@etl.go.jp>
+
+	* composite.el (composition-function-table): Variable declaration
+	moved to src/composite.c.
+	(compose-chars-after): New optional arg object.
+
 2000-11-06  Gerd Moellmann  <gerd@gnu.org>
 
 	* startup.el (fancy-splash-delay): Set to 10 seconds.
diff -r 421e3db4e24e -r 6adb10eaeaa8 src/ChangeLog
--- a/src/ChangeLog	Mon Nov 06 12:36:06 2000 +0000
+++ b/src/ChangeLog	Mon Nov 06 12:40:14 2000 +0000
@@ -1,3 +1,22 @@
+2000-11-06  Kenichi Handa  <handa@etl.go.jp>
+
+	* composite.h (compose_chars_in_text): Add prototype.
+
+	* composite.c (Vcomposition_function_table): New variable.
+	(Qcomposition_function_table): New variable.
+	(run_composition_function): Call
+	Vcompose_chars_after_function with three arguments.
+	(compose_chars_in_text): New function.
+	(syms_of_composite): Modified the doc-string of
+	Vcompose_chars_after_function.  Declare composition-function-table
+	as a lisp variable, and initialize it.
+
+	* xfns.c (x_encode_text): Suppress producing escape sequences for
+	composition.
+
+	* xselect.c: Include composite.h.
+	(selection_data_to_lisp_data): Call compose_chars_in_text on STR.
+
 2000-11-05  Andrew Innes  <andrewi@gnu.org>
 
 	* w32term.c (x_produce_glyphs): Fix typo in enum name.