mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-20 10:23:57 +00:00
Code Issues Releases Activity

(show_help_echo): Accept additional parameter

Browse Source 
ok_to_overwrite_keystroke_echo.
(read_char): Call show_help_echo with a zero
ok_to_overwrite_keystroke_echo argument.
This commit is contained in:
Eli Zaretskii 2000-07-11 07:33:06 +00:00
parent 60d2b434c0
commit adc84f484d
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/keyboard.c
View File

@ -1897,8 +1897,9 @@ make_ctrl_char (c)
/* Display a help message in the echo area. */ /* Display a help message in the echo area. */
void void
show_help_echo (msg) show_help_echo (msg, ok_to_overwrite_keystroke_echo)
Lisp_Object msg; Lisp_Object msg;
int ok_to_overwrite_keystroke_echo;
{ {
int count = specpdl_ptr - specpdl; int count = specpdl_ptr - specpdl;
@ -1911,7 +1912,7 @@ show_help_echo (msg)
else if (/* Don't overwrite minibuffer contents. */ else if (/* Don't overwrite minibuffer contents. */
!MINI_WINDOW_P (XWINDOW (selected_window)) !MINI_WINDOW_P (XWINDOW (selected_window))
/* Don't overwrite a keystroke echo. */ /* Don't overwrite a keystroke echo. */
&& NILP (echo_message_buffer) && (NILP (echo_message_buffer) || ok_to_overwrite_keystroke_echo)
/* Don't overwrite a prompt. */ /* Don't overwrite a prompt. */
&& !cursor_in_echo_area) && !cursor_in_echo_area)
{ {
@ -2668,7 +2669,7 @@ read_char (commandflag, nmaps, maps, prev_event, used_mouse_menu)
/* Display help if not echoing. */ /* Display help if not echoing. */
if (CONSP (c) && EQ (XCAR (c), Qhelp_echo)) if (CONSP (c) && EQ (XCAR (c), Qhelp_echo))
{ {
show_help_echo (XCDR (XCDR (c))); show_help_echo (XCDR (XCDR (c)), 0);
goto retry; goto retry;
} }