--- a/src/cmdloop.c	Mon Aug 13 11:12:06 2007 +0200
+++ b/src/cmdloop.c	Mon Aug 13 11:13:30 2007 +0200
@@ -40,9 +40,6 @@
 /* Current depth in recursive edits.  */
 int command_loop_level;
 
-/* Total number of times command_loop has read a key sequence.  */
-int num_input_keys;
-
 #ifndef LISP_COMMAND_LOOP
 /* Form to evaluate (if non-nil) when Emacs is started.  */
 Lisp_Object Vtop_level;
@@ -521,8 +518,8 @@
      like the real thing.  This is slightly bogus, but it's in here for
      compatibility with Emacs 18.  It's not even clear what the "right
      thing" is. */
-  if (!(((STRINGP (Vexecuting_macro) || VECTORP (Vexecuting_macro))
-         && XINT (Flength (Vexecuting_macro)) == 1)))
+  if (!((STRINGP (Vexecuting_macro) || VECTORP (Vexecuting_macro))
+	&& XINT (Flength (Vexecuting_macro)) == 1))
     Vlast_command = Qt;
 
 #ifndef LISP_COMMAND_LOOP
@@ -536,7 +533,7 @@
          focus is selected. */
       if (focus_follows_mouse)
         investigate_frame_change ();
-      
+
       /* Make sure the current window's buffer is selected.  */
       {
 	Lisp_Object selected_window = Fselected_window (Qnil);