diff options
| author | Richard M. Stallman <rms@gnu.org> | 2004-11-07 03:48:56 +0000 |
|---|---|---|
| committer | Richard M. Stallman <rms@gnu.org> | 2004-11-07 03:48:56 +0000 |
| commit | c9aa6a41844ea095db79d56251cf0bf23e3c5376 (patch) | |
| tree | 81874426509134f2192299cf7a9044b7ca912865 /src/callint.c | |
| parent | e1e419ecc6263bc887bc4c4a23f1db4e8582da81 (diff) | |
| download | emacs-c9aa6a41844ea095db79d56251cf0bf23e3c5376.tar.gz | |
(Fcall_interactively): Avoid reusing EVENT for other data.
Diffstat (limited to 'src/callint.c')
| -rw-r--r-- | src/callint.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/callint.c b/src/callint.c index da88693cd78..2b8ae86f16f 100644 --- a/src/callint.c +++ b/src/callint.c @@ -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++; } |