Mercurial > emacs

changeset 58967:33c30193127d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(read_char): Save and restore echo_string when handling input method.
author Kim F. Storm <storm@cua.dk>
date Wed, 15 Dec 2004 00:07:15 +0000
parents 3e2d3004c744
children 036ee6579046
files src/keyboard.c
diffstat 1 files changed, 2 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/keyboard.c	Wed Dec 15 00:06:46 2004 +0000
+++ b/src/keyboard.c	Wed Dec 15 00:07:15 2004 +0000
@@ -3044,6 +3044,7 @@
       /* Save the echo status.  */
       int saved_immediate_echo = current_kboard->immediate_echo;
       struct kboard *saved_ok_to_echo = ok_to_echo_at_next_pause;
+      Lisp_Object saved_echo_string = current_kboard->echo_string;
       int saved_echo_after_prompt = current_kboard->echo_after_prompt;
 
 #if 0
@@ -3098,6 +3099,7 @@
 
       cancel_echoing ();
       ok_to_echo_at_next_pause = saved_ok_to_echo;
+      current_kboard->echo_string = saved_echo_string;
       current_kboard->echo_after_prompt = saved_echo_after_prompt;
       if (saved_immediate_echo)
 	echo_now ();