(command_loop_1): Put back cancel_echoing call, if there's a perdisplay for it

to apply to.
(init_perdisplay): Initialize echo vars.

diff --git a/src/keyboard.c b/src/keyboard.c
index df2c372..495b36f 100644 (file)
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -902,6 +902,8 @@ command_loop_1 ()
 
   Vdeactivate_mark = Qnil;
   waiting_for_input = 0;
+  if (current_perdisplay)
+    cancel_echoing ();
 
   nonundocount = 0;
   no_redisplay = 0;
@@ -6051,6 +6053,9 @@ init_perdisplay (perd)
   perd->internal_last_event_frame = Qnil;
 #endif
   perd->Vlast_event_frame = Qnil;
+  perd->immediate_echo = 0;
+  perd->echoptr = perd->echobuf;
+  perd->echo_after_prompt = -1;
 }
 
 /*