From: Karl Heuer <kwzh@gnu.org>
Date: Wed, 8 Feb 1995 06:37:26 +0000 (+0000)
Subject: (command_loop_1): Put back cancel_echoing call, if there's a perdisplay for it
X-Git-Tag: emacs-19.34~5157
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=267de7a152075f20f0343f14c116b082031f597d;p=emacs.git

(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 df2c372f441..495b36f6f9b 100644
--- 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;
 }
 
 /*