Mercurial > emacs

comparison src/keyboard.c @ 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 47204c294c8d
children 59945307b86b
comparison
equal deleted inserted replaced
58966:3e2d3004c744 58967:33c30193127d
3042 int count = SPECPDL_INDEX (); 3042 int count = SPECPDL_INDEX ();
3043 3043
3044 /* Save the echo status. */ 3044 /* Save the echo status. */
3045 int saved_immediate_echo = current_kboard->immediate_echo; 3045 int saved_immediate_echo = current_kboard->immediate_echo;
3046 struct kboard *saved_ok_to_echo = ok_to_echo_at_next_pause; 3046 struct kboard *saved_ok_to_echo = ok_to_echo_at_next_pause;
3047 Lisp_Object saved_echo_string = current_kboard->echo_string;
3047 int saved_echo_after_prompt = current_kboard->echo_after_prompt; 3048 int saved_echo_after_prompt = current_kboard->echo_after_prompt;
3048 3049
3049 #if 0 3050 #if 0
3050 if (before_command_restore_flag) 3051 if (before_command_restore_flag)
3051 { 3052 {
3096 if (key_count > 0) 3097 if (key_count > 0)
3097 this_command_keys = keys; 3098 this_command_keys = keys;
3098 3099
3099 cancel_echoing (); 3100 cancel_echoing ();
3100 ok_to_echo_at_next_pause = saved_ok_to_echo; 3101 ok_to_echo_at_next_pause = saved_ok_to_echo;
3102 current_kboard->echo_string = saved_echo_string;
3101 current_kboard->echo_after_prompt = saved_echo_after_prompt; 3103 current_kboard->echo_after_prompt = saved_echo_after_prompt;
3102 if (saved_immediate_echo) 3104 if (saved_immediate_echo)
3103 echo_now (); 3105 echo_now ();
3104 3106
3105 UNGCPRO; 3107 UNGCPRO;