/* Keyboard macros.
- Copyright (C) 1985, 1986, 1993, 2000, 2001 Free Software Foundation, Inc.
+ Copyright (C) 1985, 1986, 1993, 2000, 2001, 2002, 2003, 2004,
+ 2005 Free Software Foundation, Inc.
This file is part of GNU Emacs.
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, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
#include <config.h>
/* Index of next character to fetch from that macro. */
-EMACS_INT executing_macro_index;
+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. */
-int executing_macro_iterations;
+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.
We use it only as a kind of flag, so no need to protect it. */
-Lisp_Object executing_macro;
+Lisp_Object executing_kbd_macro;
extern Lisp_Object real_this_command;
}
/* Must convert meta modifier when copying string to vector. */
- cvt = STRINGP (current_kboard->Vlast_kbd_macro);
+ cvt = STRINGP (current_kboard->Vlast_kbd_macro);
for (i = 0; i < len; i++)
{
Lisp_Object c;
return Qnil;
}
-/* Restore Vexecuting_kbd_macro and executing_macro_index - called when
- the unwind-protect in Fexecute_kbd_macro gets invoked. */
+/* Restore Vexecuting_kbd_macro and executing_kbd_macro_index.
+ Called when the unwind-protect in Fexecute_kbd_macro gets invoked. */
static Lisp_Object
pop_kbd_macro (info)
Lisp_Object tem;
Vexecuting_kbd_macro = XCAR (info);
tem = XCDR (info);
- executing_macro_index = XINT (XCAR (tem));
+ executing_kbd_macro_index = XINT (XCAR (tem));
real_this_command = XCDR (tem);
Frun_hooks (1, &Qkbd_macro_termination_hook);
return Qnil;
struct gcpro gcpro1, gcpro2;
int success_count = 0;
- executing_macro_iterations = 0;
+ executing_kbd_macro_iterations = 0;
if (!NILP (count))
{
error ("Keyboard macros must be strings or vectors");
tem = Fcons (Vexecuting_kbd_macro,
- Fcons (make_number (executing_macro_index),
+ Fcons (make_number (executing_kbd_macro_index),
real_this_command));
record_unwind_protect (pop_kbd_macro, tem);
do
{
Vexecuting_kbd_macro = final;
- executing_macro = final;
- executing_macro_index = 0;
+ executing_kbd_macro = final;
+ executing_kbd_macro_index = 0;
current_kboard->Vprefix_arg = Qnil;
command_loop_1 ();
- executing_macro_iterations = ++success_count;
+ executing_kbd_macro_iterations = ++success_count;
QUIT;
}
while (--repeat
&& (STRINGP (Vexecuting_kbd_macro) || VECTORP (Vexecuting_kbd_macro)));
- executing_macro = Qnil;
+ executing_kbd_macro = Qnil;
real_this_command = Vexecuting_kbd_macro;
init_macros ()
{
Vexecuting_kbd_macro = Qnil;
- executing_macro = Qnil;
+ executing_kbd_macro = Qnil;
}
void
doc: /* Currently executing keyboard macro (string or vector).
This is nil when not executing a keyboard macro. */);
- DEFVAR_INT ("executing-macro-index", &executing_macro_index,
+ DEFVAR_INT ("executing-kbd-macro-index", &executing_kbd_macro_index,
doc: /* Index in currently executing keyboard macro; undefined if none executing. */);
DEFVAR_KBOARD ("last-kbd-macro", Vlast_kbd_macro,