Mercurial > emacs
comparison src/keyboard.c @ 22835:1cda5e4bddba
(Fexecute_extended_command):
Don't delay before displaying the suggestion message
if the command did not display anything in the echo area.
author | Richard M. Stallman <rms@gnu.org> |
---|---|
date | Mon, 27 Jul 1998 05:37:42 +0000 |
parents | a3fe2af7cefb |
children | 58a8427745ec |
comparison
equal
deleted
inserted
replaced
22834:926aae368e61 | 22835:1cda5e4bddba |
---|---|
7889 if (!NILP (bindings) | 7889 if (!NILP (bindings) |
7890 && ! (VECTORP (bindings) && EQ (Faref (bindings, make_number (0)), | 7890 && ! (VECTORP (bindings) && EQ (Faref (bindings, make_number (0)), |
7891 Qmouse_movement))) | 7891 Qmouse_movement))) |
7892 { | 7892 { |
7893 /* But first wait, and skip the message if there is input. */ | 7893 /* But first wait, and skip the message if there is input. */ |
7894 if (!NILP (Fsit_for ((NUMBERP (Vsuggest_key_bindings) | 7894 int delay_time; |
7895 ? Vsuggest_key_bindings : make_number (2)), | 7895 if (echo_area_glyphs != 0) |
7896 Qnil, Qnil)) | 7896 /* This command displayed something in the echo area; |
7897 so wait a few seconds, then display our suggestion message. */ | |
7898 delay_time = (NUMBERP (Vsuggest_key_bindings) | |
7899 ? XINT (Vsuggest_key_bindings) : 2); | |
7900 else | |
7901 /* This command left the echo area empty, | |
7902 so display our message immediately. */ | |
7903 delay_time = 0; | |
7904 | |
7905 if (!NILP (Fsit_for (make_number (delay_time), Qnil, Qnil)) | |
7897 && ! CONSP (Vunread_command_events)) | 7906 && ! CONSP (Vunread_command_events)) |
7898 { | 7907 { |
7899 Lisp_Object binding; | 7908 Lisp_Object binding; |
7900 char *newmessage; | 7909 char *newmessage; |
7901 char *oldmessage = echo_area_glyphs; | 7910 char *oldmessage = echo_area_glyphs; |