# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 1103697169 0
# Node ID 9793bbaae7d313b1266ed5c34538e263240114f8
# Parent  fdadde62c624b263eaae1e5b918017bffd3f38ae
*** empty log message ***

diff -r fdadde62c624 -r 9793bbaae7d3 lisp/ChangeLog
--- a/lisp/ChangeLog	Wed Dec 22 06:32:30 2004 +0000
+++ b/lisp/ChangeLog	Wed Dec 22 06:32:49 2004 +0000
@@ -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 -r fdadde62c624 -r 9793bbaae7d3 src/ChangeLog
--- a/src/ChangeLog	Wed Dec 22 06:32:30 2004 +0000
+++ b/src/ChangeLog	Wed Dec 22 06:32:49 2004 +0000
@@ -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.