From: Richard M. Stallman <rms@gnu.org>
Date: Sun, 7 Nov 2004 03:48:56 +0000 (+0000)
Subject: (Fcall_interactively): Avoid reusing EVENT for other data.
X-Git-Tag: ttn-vms-21-2-B4~4139
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c9aa6a41844ea095db79d56251cf0bf23e3c5376;p=emacs.git

(Fcall_interactively): Avoid reusing EVENT for other data.
---

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++;
 	}