# HG changeset patch
# User Karl Heuer <kwzh@gnu.org>
# Date 792225446 0
# Node ID 358030fd130c78c721b944f6a159ab5df0ac08c8
# Parent  f6f235bc26ba31fbb4244e7947abf969ef39cf14
(command_loop_1): Put back cancel_echoing call, if there's a perdisplay for it
to apply to.
(init_perdisplay): Initialize echo vars.

diff -r f6f235bc26ba -r 358030fd130c src/keyboard.c
--- a/src/keyboard.c	Wed Feb 08 06:35:50 1995 +0000
+++ b/src/keyboard.c	Wed Feb 08 06:37:26 1995 +0000
@@ -902,6 +902,8 @@
 
   Vdeactivate_mark = Qnil;
   waiting_for_input = 0;
+  if (current_perdisplay)
+    cancel_echoing ();
 
   nonundocount = 0;
   no_redisplay = 0;
@@ -6051,6 +6053,9 @@
   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;
 }
 
 /*