From c9aa6a41844ea095db79d56251cf0bf23e3c5376 Mon Sep 17 00:00:00 2001
From: Richard M. Stallman
Date: Sun, 7 Nov 2004 03:48:56 +0000
Subject: (Fcall_interactively): Avoid reusing EVENT for other data.

---
 src/callint.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/callint.c')

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++;
 	}
-- 
cgit v1.2.1


From 33247f0c3af678831a4e80bde904996bfff69f5c Mon Sep 17 00:00:00 2001
From: Kim F. Storm
Date: Tue, 9 Nov 2004 13:18:58 +0000
Subject: (Fcall_interactively): Remove unused variable 'funcar'.

---
 src/callint.c | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/callint.c')

diff --git a/src/callint.c b/src/callint.c
index 2b8ae86f16f..bb71ad50f44 100644
--- a/src/callint.c
+++ b/src/callint.c
@@ -265,7 +265,6 @@ If KEYS is omitted or nil, the return value of `this-command-keys' is used.  */)
   Lisp_Object *args, *visargs;
   unsigned char **argstrings;
   Lisp_Object fun;
-  Lisp_Object funcar;
   Lisp_Object specs;
   Lisp_Object filter_specs;
   Lisp_Object teml;
-- 
cgit v1.2.1