summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>1996-02-01 06:04:44 +0000
committerRichard M. Stallman <rms@gnu.org>1996-02-01 06:04:44 +0000
commitbf89d448e6136ff80da96aba11d51b872efaad0c (patch)
tree97944d5e178cece3de066a30ff46a4363c78e7c7
parente88c8a35a2c8c7ca7abd4b1a59e9143d6e8707f2 (diff)
downloademacs-bf89d448e6136ff80da96aba11d51b872efaad0c.tar.gz
(echo_now): Renamed from `echo'. All callers changed.
-rw-r--r--src/keyboard.c12
1 files changed, 6 insertions, 6 deletions
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 ();
}
}