(waiting_for_input): Remove unnecessary prototype.

[bpt/emacs.git] / src / macros.h

diff --git a/src/macros.h b/src/macros.h
index 36d6689..8f3f003 100644 (file)
--- a/src/macros.h
+++ b/src/macros.h
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
@@ -15,17 +15,36 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
-/* Kbd macro currently being executed (a string) */
+/* Kbd macro currently being executed (a string or vector).  */
 
 extern Lisp_Object Vexecuting_macro;
 
-/* Index of next character to fetch from that macro */
+/* Index of next character to fetch from that macro.  */
 
 extern int executing_macro_index;
 
-/* Nonzero while defining a kbd macro */
+/* Number of successful iterations so far
+   for innermost keyboard macro.
+   This is not bound at each level,
+   so after an error, it describes the innermost interrupted macro.  */
 
-extern int defining_kbd_macro;
+extern int executing_macro_iterations;
+
+/* This is the macro that was executing.
+   This is not bound at each level,
+   so after an error, it describes the innermost interrupted macro.  */
+
+extern Lisp_Object executing_macro;
+
+/* Declare that all chars stored so far in the kbd macro being defined
+ really belong to it.  This is done in between editor commands.  */
+
+extern void finalize_kbd_macro_chars P_ ((void));
+
+/* Store a character into kbd macro being defined */
+
+extern void store_kbd_macro_char P_ ((Lisp_Object));