From: Kenichi Handa <handa@m17n.org>
Date: Wed, 22 Dec 2004 06:32:49 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: ttn-vms-21-2-B4~3175
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7a0ea9e3554e4fc99c0c7de0216dc8915fe5b6ee;p=emacs.git

*** empty log message ***
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 31b01552667..2795cbf26d4 100644
--- 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 c2e81ad6a17..0a6612e962d 100644
--- 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.