*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 31b01552667d8872e7e16c9936551f58d6cb5761..2795cbf26d4f687ff6b2460bf283c160456dbf03 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2004-12-22  Kenichi Handa  <handa@m17n.org>
+
+       * international/quail.el (quail-start-translation): Fix prompt
+       string for the case if input-method-use-echo-area being non-nil.
+       (quail-start-conversion): Likewise.
+       (quail-show-guidance): Don't show guidance if
+       input-method-use-echo-area is non-nil.
+
 2004-12-21  Richard M. Stallman  <rms@gnu.org>
 
        * textmodes/ispell.el (ispell-help): Bind resize-mini-windows.

diff --git a/src/ChangeLog b/src/ChangeLog
index c2e81ad6a17565094a99d3164f09983f3b514887..0a6612e962da8c7f9ebeb91a05f9876112c7ecb3 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2004-12-22  Kenichi Handa  <handa@m17n.org>
+
+       * xselect.c (Fx_get_cut_buffer_internal): Return a unibyte string.
+
 2004-12-21  Richard M. Stallman  <rms@gnu.org>
 
        * eval.c (unwind_to_catch): Clear immediate_quit.