aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRichard M. Stallman1996-02-01 06:04:44 +0000
committerRichard M. Stallman1996-02-01 06:04:44 +0000
commit3dbd9ee42d4bcf5b6eb2b845d206b48190ac1bcb (patch)
tree554b46256b974388ee337c72125eb31619458cc1 /src
parent7ea13e12ee48674e951e49bf9d5ac69324107a10 (diff)
downloademacs-3dbd9ee42d4bcf5b6eb2b845d206b48190ac1bcb.tar.gz
emacs-3dbd9ee42d4bcf5b6eb2b845d206b48190ac1bcb.zip
(echo_now): Renamed from `echo'. All callers changed.
Diffstat (limited to 'src')
-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)
560 560
561 current_kboard->echo_after_prompt = len; 561 current_kboard->echo_after_prompt = len;
562 562
563 echo (); 563 echo_now ();
564} 564}
565 565
566/* Add C to the echo string, if echoing is going on. 566/* Add C to the echo string, if echoing is going on.
@@ -608,7 +608,7 @@ echo_char (c)
608 *ptr = 0; 608 *ptr = 0;
609 current_kboard->echoptr = ptr; 609 current_kboard->echoptr = ptr;
610 610
611 echo (); 611 echo_now ();
612 } 612 }
613} 613}
614 614
@@ -633,13 +633,13 @@ echo_dash ()
633 current_kboard->echoptr[0] = '-'; 633 current_kboard->echoptr[0] = '-';
634 current_kboard->echoptr[1] = 0; 634 current_kboard->echoptr[1] = 0;
635 635
636 echo (); 636 echo_now ();
637} 637}
638 638
639/* Display the current echo string, and begin echoing if not already 639/* Display the current echo string, and begin echoing if not already
640 doing so. */ 640 doing so. */
641 641
642echo () 642echo_now ()
643{ 643{
644 if (!current_kboard->immediate_echo) 644 if (!current_kboard->immediate_echo)
645 { 645 {
@@ -1825,7 +1825,7 @@ read_char (commandflag, nmaps, maps, prev_event, used_mouse_menu)
1825 This is because we are probably about to display a menu, 1825 This is because we are probably about to display a menu,
1826 and we don't want to delay before doing so. */ 1826 and we don't want to delay before doing so. */
1827 if (EVENT_HAS_PARAMETERS (prev_event)) 1827 if (EVENT_HAS_PARAMETERS (prev_event))
1828 echo (); 1828 echo_now ();
1829 else 1829 else
1830 { 1830 {
1831 save_getcjmp (save_jump); 1831 save_getcjmp (save_jump);
@@ -1833,7 +1833,7 @@ read_char (commandflag, nmaps, maps, prev_event, used_mouse_menu)
1833 tem0 = sit_for (echo_keystrokes, 0, 1, 1); 1833 tem0 = sit_for (echo_keystrokes, 0, 1, 1);
1834 restore_getcjmp (save_jump); 1834 restore_getcjmp (save_jump);
1835 if (EQ (tem0, Qt)) 1835 if (EQ (tem0, Qt))
1836 echo (); 1836 echo_now ();
1837 } 1837 }
1838 } 1838 }
1839 1839