*** empty log message ***

2 files changed, 25 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 62276d314d9..749be514062 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/src/ChangeLog b/src/ChangeLog
index 168d290ea2c..4b36b5a39ab 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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.