mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-03-14 10:51:20 -07:00
* callint.c (Fcall_interactively): Remove the 'K' interactive
code, in favor of 'e'; that's a better name. * callint.c (Fcall_interactively): Don't try to get the `enable-recursive-minibuffers' property from FUNCTION unless FUNCTION is actually a symbol; there are some cases where a key sequence is bound directly to a lambda form, and there's no reason to break these.
This commit is contained in:
parent
8aaa7c8a2e
commit
afa4c0f3cd
1 changed files with 4 additions and 5 deletions
|
|
@ -70,7 +70,6 @@ e -- Mouse click that invoked this command (value of `last-nonmenu-event').\n\
|
|||
f -- Existing file name.\n\
|
||||
F -- Possibly nonexistent file name.\n\
|
||||
k -- Key sequence (string).\n\
|
||||
K -- Mouse click that invoked this command (value of `last-nonmenu-event').\n\
|
||||
m -- Value of mark as number. Does not do I/O.\n\
|
||||
n -- Number read using minibuffer.\n\
|
||||
N -- Prefix arg converted to number, or if none, do like code `n'.\n\
|
||||
|
|
@ -183,7 +182,8 @@ Otherwise, this is done only if an arg is read using the minibuffer.")
|
|||
|
||||
retry:
|
||||
|
||||
enable = Fget (function, Qenable_recursive_minibuffers);
|
||||
if (XTYPE (function) == Lisp_Symbol)
|
||||
enable = Fget (function, Qenable_recursive_minibuffers);
|
||||
|
||||
fun = indirect_function (function);
|
||||
|
||||
|
|
@ -390,9 +390,8 @@ Otherwise, this is done only if an arg is read using the minibuffer.")
|
|||
visargs[i] = Fkey_description (teml);
|
||||
break;
|
||||
|
||||
case 'K': /* Mouse click. */
|
||||
case 'e': /* New, better name. */
|
||||
args[i] = last_nonmenu_event;
|
||||
case 'e': /* Mouse click. */
|
||||
args[i] = last_command_char;
|
||||
if (NILP (Fmouse_click_p (args[i])))
|
||||
error ("%s must be bound to a mouse click.",
|
||||
(XTYPE (function) == Lisp_Symbol
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue