Mercurial > emacs
comparison src/keyboard.c @ 20270:3f3e7319341a
(Fexecute_extended_command): Fix message wording.
Don't print a message for a binding for mouse-movement.
author | Karl Heuer <kwzh@gnu.org> |
---|---|
date | Mon, 17 Nov 1997 02:15:35 +0000 |
parents | 52eb1c7d37a2 |
children | cfba77fb710b |
comparison
equal
deleted
inserted
replaced
20269:ca337d0a1553 | 20270:3f3e7319341a |
---|---|
7249 value = Qnil; | 7249 value = Qnil; |
7250 GCPRO2 (bindings, value); | 7250 GCPRO2 (bindings, value); |
7251 value = Fcommand_execute (function, Qt, Qnil, Qnil); | 7251 value = Fcommand_execute (function, Qt, Qnil, Qnil); |
7252 | 7252 |
7253 /* If the command has a key binding, print it now. */ | 7253 /* If the command has a key binding, print it now. */ |
7254 if (!NILP (bindings)) | 7254 if (!NILP (bindings) |
7255 && ! (ARRAYP (bindings) && EQ (Faref (bindings), Qmouse_movement))) | |
7255 { | 7256 { |
7256 /* But first wait, and skip the message if there is input. */ | 7257 /* But first wait, and skip the message if there is input. */ |
7257 if (!NILP (Fsit_for ((NUMBERP (Vsuggest_key_bindings) | 7258 if (!NILP (Fsit_for ((NUMBERP (Vsuggest_key_bindings) |
7258 ? Vsuggest_key_bindings : make_number (2)), | 7259 ? Vsuggest_key_bindings : make_number (2)), |
7259 Qnil, Qnil)) | 7260 Qnil, Qnil)) |
7268 | 7269 |
7269 newmessage | 7270 newmessage |
7270 = (char *) alloca (XSYMBOL (function)->name->size | 7271 = (char *) alloca (XSYMBOL (function)->name->size |
7271 + XSTRING (binding)->size | 7272 + XSTRING (binding)->size |
7272 + 100); | 7273 + 100); |
7273 sprintf (newmessage, "You can run the command `%s' by typing %s", | 7274 sprintf (newmessage, "You can run the command `%s' with %s", |
7274 XSYMBOL (function)->name->data, | 7275 XSYMBOL (function)->name->data, |
7275 XSTRING (binding)->data); | 7276 XSTRING (binding)->data); |
7276 message1_nolog (newmessage); | 7277 message1_nolog (newmessage); |
7277 if (!NILP (Fsit_for ((NUMBERP (Vsuggest_key_bindings) | 7278 if (!NILP (Fsit_for ((NUMBERP (Vsuggest_key_bindings) |
7278 ? Vsuggest_key_bindings : make_number (2)), | 7279 ? Vsuggest_key_bindings : make_number (2)), |