Commit c9aa6a41 authored by Richard M. Stallman's avatar Richard M. Stallman
Browse files

(Fcall_interactively): Avoid reusing EVENT for other data.

parent e1e419ec
......@@ -451,25 +451,25 @@ If KEYS is omitted or nil, the return value of `this-command-keys' is used. */)
string++;
else if (*string == '@')
{
Lisp_Object event;
Lisp_Object event, tem;
event = (next_event < key_count
? XVECTOR (keys)->contents[next_event]
: Qnil);
if (EVENT_HAS_PARAMETERS (event)
&& (event = XCDR (event), CONSP (event))
&& (event = XCAR (event), CONSP (event))
&& (event = XCAR (event), WINDOWP (event)))
&& (tem = XCDR (event), CONSP (tem))
&& (tem = XCAR (tem), CONSP (tem))
&& (tem = XCAR (tem), WINDOWP (tem)))
{
if (MINI_WINDOW_P (XWINDOW (event))
&& ! (minibuf_level > 0 && EQ (event, minibuf_window)))
if (MINI_WINDOW_P (XWINDOW (tem))
&& ! (minibuf_level > 0 && EQ (tem, minibuf_window)))
error ("Attempt to select inactive minibuffer window");
/* If the current buffer wants to clean up, let it. */
if (!NILP (Vmouse_leave_buffer_hook))
call1 (Vrun_hooks, Qmouse_leave_buffer_hook);
Fselect_window (event, Qnil);
Fselect_window (tem, Qnil);
}
string++;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment