Mercurial > emacs

changeset 30142:5bfb859adb13

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(show_help_echo): Accept additional parameter ok_to_overwrite_keystroke_echo. (read_char): Call show_help_echo with a zero ok_to_overwrite_keystroke_echo argument.
author Eli Zaretskii <eliz@gnu.org>
date Tue, 11 Jul 2000 07:33:06 +0000
parents 570efb22ec0b
children 61a15122ab3b
files src/keyboard.c
diffstat 1 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/keyboard.c	Tue Jul 11 07:26:25 2000 +0000
+++ b/src/keyboard.c	Tue Jul 11 07:33:06 2000 +0000
@@ -1897,8 +1897,9 @@
 
 /* Display a help message in the echo area.  */
 void
-show_help_echo (msg)
+show_help_echo (msg, ok_to_overwrite_keystroke_echo)
      Lisp_Object msg;
+     int ok_to_overwrite_keystroke_echo;
 {
   int count = specpdl_ptr - specpdl;
 
@@ -1911,7 +1912,7 @@
   else if (/* Don't overwrite minibuffer contents.  */
 	   !MINI_WINDOW_P (XWINDOW (selected_window))
 	   /* Don't overwrite a keystroke echo.  */
-	   && NILP (echo_message_buffer)
+	   && (NILP (echo_message_buffer) || ok_to_overwrite_keystroke_echo)
 	   /* Don't overwrite a prompt.  */
 	   && !cursor_in_echo_area)
     {
@@ -2668,7 +2669,7 @@
   /* Display help if not echoing.  */
   if (CONSP (c) && EQ (XCAR (c), Qhelp_echo))
     {
-      show_help_echo (XCDR (XCDR (c)));
+      show_help_echo (XCDR (XCDR (c)), 0);
       goto retry;
     }