aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRichard M. Stallman2004-11-07 03:48:56 +0000
committerRichard M. Stallman2004-11-07 03:48:56 +0000
commitc9aa6a41844ea095db79d56251cf0bf23e3c5376 (patch)
tree81874426509134f2192299cf7a9044b7ca912865 /src
parente1e419ecc6263bc887bc4c4a23f1db4e8582da81 (diff)
downloademacs-c9aa6a41844ea095db79d56251cf0bf23e3c5376.tar.gz
emacs-c9aa6a41844ea095db79d56251cf0bf23e3c5376.zip
(Fcall_interactively): Avoid reusing EVENT for other data.
Diffstat (limited to 'src')
-rw-r--r--src/callint.c14
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. */)
451 string++; 451 string++;
452 else if (*string == '@') 452 else if (*string == '@')
453 { 453 {
454 Lisp_Object event; 454 Lisp_Object event, tem;
455 455
456 event = (next_event < key_count 456 event = (next_event < key_count
457 ? XVECTOR (keys)->contents[next_event] 457 ? XVECTOR (keys)->contents[next_event]
458 : Qnil); 458 : Qnil);
459 if (EVENT_HAS_PARAMETERS (event) 459 if (EVENT_HAS_PARAMETERS (event)
460 && (event = XCDR (event), CONSP (event)) 460 && (tem = XCDR (event), CONSP (tem))
461 && (event = XCAR (event), CONSP (event)) 461 && (tem = XCAR (tem), CONSP (tem))
462 && (event = XCAR (event), WINDOWP (event))) 462 && (tem = XCAR (tem), WINDOWP (tem)))
463 { 463 {
464 if (MINI_WINDOW_P (XWINDOW (event)) 464 if (MINI_WINDOW_P (XWINDOW (tem))
465 && ! (minibuf_level > 0 && EQ (event, minibuf_window))) 465 && ! (minibuf_level > 0 && EQ (tem, minibuf_window)))
466 error ("Attempt to select inactive minibuffer window"); 466 error ("Attempt to select inactive minibuffer window");
467 467
468 /* If the current buffer wants to clean up, let it. */ 468 /* If the current buffer wants to clean up, let it. */
469 if (!NILP (Vmouse_leave_buffer_hook)) 469 if (!NILP (Vmouse_leave_buffer_hook))
470 call1 (Vrun_hooks, Qmouse_leave_buffer_hook); 470 call1 (Vrun_hooks, Qmouse_leave_buffer_hook);
471 471
472 Fselect_window (event, Qnil); 472 Fselect_window (tem, Qnil);
473 } 473 }
474 string++; 474 string++;
475 } 475 }