(tool_bar_lines_needed): New local `temp_row' for clarity.

[gnu-emacs] / src / macros.h

diff --git a/src/macros.h b/src/macros.h
index 95480e2cd31af4daca2070dca78b7096f4f46ef1..bdd510456b0490bfeaab8092f7b9c45457da14b1 100644 (file)
--- a/src/macros.h
+++ b/src/macros.h
@@ -1,5 +1,6 @@
 /* Definitions for keyboard macro interpretation in GNU Emacs.
-   Copyright (C) 1985 Free Software Foundation, Inc.
+   Copyright (C) 1985, 2002, 2003, 2004, 2005,
+                 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -15,13 +16,43 @@ 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., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
-/* Kbd macro currently being executed (a string) */
+/* Kbd macro currently being executed (a string or vector).  */
 
-extern Lisp_Object Vexecuting_macro;
+extern Lisp_Object Vexecuting_kbd_macro;
 
-/* Index of next character to fetch from that macro */
+/* Index of next character to fetch from that macro.  */
 
-extern int executing_macro_index;
+extern EMACS_INT executing_kbd_macro_index;
+
+/* 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 executing_kbd_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_kbd_macro;
+
+/* Finish defining the current keyboard macro.  */
+
+extern void end_kbd_macro P_ ((void));
+
+/* 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));
+
+/* arch-tag: 8edb7088-682f-4d1f-a4d9-0fbb7284234e
+   (do not change this comment) */