*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 62276d314d9512bf223962ac9f62ec92a8cfcd0b..749be514062b76e788eb87fdda5ffc5b62d13bbf 100644 (file)
--- 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 168d290ea2cf1d3258095701fc0bb1ed511e6f17..4b36b5a39abb6e7f1fb3fc971c217da839a6022d 100644 (file)
--- 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.