Mercurial > emacs
comparison src/keyboard.c @ 14454:e5414c274414
(echo_now): Renamed from `echo'. All callers changed.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Thu, 01 Feb 1996 06:04:44 +0000 |
| parents | 58afa829c736 |
| children | c463c25a6806 |
comparison
equal
deleted
inserted
replaced
| 14453:58afa829c736 | 14454:e5414c274414 |
|---|---|
| 558 current_kboard->echoptr = current_kboard->echobuf + len; | 558 current_kboard->echoptr = current_kboard->echobuf + len; |
| 559 *current_kboard->echoptr = '\0'; | 559 *current_kboard->echoptr = '\0'; |
| 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. |
| 567 C can be a character, which is printed prettily ("M-C-x" and all that | 567 C can be a character, which is printed prettily ("M-C-x" and all that |
| 568 jazz), or a symbol, whose name is printed. */ | 568 jazz), or a symbol, whose name is printed. */ |
| 606 } | 606 } |
| 607 | 607 |
| 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 |
| 615 /* Temporarily add a dash to the end of the echo string if it's not | 615 /* Temporarily add a dash to the end of the echo string if it's not |
| 616 empty, so that it serves as a mini-prompt for the very next character. */ | 616 empty, so that it serves as a mini-prompt for the very next character. */ |
| 631 /* Put a dash at the end of the buffer temporarily, | 631 /* Put a dash at the end of the buffer temporarily, |
| 632 but make it go away when the next character is added. */ | 632 but make it go away when the next character is added. */ |
| 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 |
| 642 echo () | 642 echo_now () |
| 643 { | 643 { |
| 644 if (!current_kboard->immediate_echo) | 644 if (!current_kboard->immediate_echo) |
| 645 { | 645 { |
| 646 int i; | 646 int i; |
| 647 current_kboard->immediate_echo = 1; | 647 current_kboard->immediate_echo = 1; |
| 1823 | 1823 |
| 1824 /* After a mouse event, start echoing right away. | 1824 /* After a mouse event, start echoing right away. |
| 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); |
| 1832 restore_getcjmp (local_getcjmp); | 1832 restore_getcjmp (local_getcjmp); |
| 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 |
| 1840 /* Maybe auto save due to number of keystrokes. */ | 1840 /* Maybe auto save due to number of keystrokes. */ |
| 1841 | 1841 |