From: Richard M. Stallman <rms@gnu.org>
Date: Thu, 1 Feb 1996 06:04:44 +0000 (+0000)
Subject: (echo_now): Renamed from `echo'.  All callers changed.
X-Git-Tag: emacs-19.34~1406
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3dbd9ee42d4bcf5b6eb2b845d206b48190ac1bcb;p=emacs.git

(echo_now): Renamed from `echo'.  All callers changed.
---

diff --git a/src/keyboard.c b/src/keyboard.c
index 7db3082cc58..997020c50af 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -560,7 +560,7 @@ echo_prompt (str)
 
   current_kboard->echo_after_prompt = len;
 
-  echo ();
+  echo_now ();
 }
 
 /* Add C to the echo string, if echoing is going on.
@@ -608,7 +608,7 @@ echo_char (c)
       *ptr = 0;
       current_kboard->echoptr = ptr;
 
-      echo ();
+      echo_now ();
     }
 }
 
@@ -633,13 +633,13 @@ echo_dash ()
   current_kboard->echoptr[0] = '-';
   current_kboard->echoptr[1] = 0;
 
-  echo ();
+  echo_now ();
 }
 
 /* Display the current echo string, and begin echoing if not already
    doing so.  */
 
-echo ()
+echo_now ()
 {
   if (!current_kboard->immediate_echo)
     {
@@ -1825,7 +1825,7 @@ read_char (commandflag, nmaps, maps, prev_event, used_mouse_menu)
 	 This is because we are probably about to display a menu,
 	 and we don't want to delay before doing so.  */
       if (EVENT_HAS_PARAMETERS (prev_event))
-	echo ();
+	echo_now ();
       else
 	{
 	  save_getcjmp (save_jump);
@@ -1833,7 +1833,7 @@ read_char (commandflag, nmaps, maps, prev_event, used_mouse_menu)
 	  tem0 = sit_for (echo_keystrokes, 0, 1, 1);
 	  restore_getcjmp (save_jump);
 	  if (EQ (tem0, Qt))
-	    echo ();
+	    echo_now ();
 	}
     }