From 524ed533b0c2904ef56c9e034c4f69d131431b31 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Sun, 1 May 2005 18:48:26 +0000 Subject: [PATCH] (Vexecuting_kbd_macro): Renamed from Vexecuting_macro. All uses changed. (syms_of_macros): Define only executing-kbd-macro, not executing-macro. --- src/macros.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/src/macros.c b/src/macros.c index 09ae87b0a59..04c8e1cd61f 100644 --- a/src/macros.c +++ b/src/macros.c @@ -31,7 +31,7 @@ Lisp_Object Qexecute_kbd_macro, Qkbd_macro_termination_hook; /* Kbd macro currently being executed (a string or vector). */ -Lisp_Object Vexecuting_macro; +Lisp_Object Vexecuting_kbd_macro; /* Index of next character to fetch from that macro. */ @@ -285,7 +285,7 @@ each iteration of the macro. Iteration stops if LOOPFUNC returns nil. */) return Qnil; } -/* Restore Vexecuting_macro and executing_macro_index - called when +/* Restore Vexecuting_kbd_macro and executing_macro_index - called when the unwind-protect in Fexecute_kbd_macro gets invoked. */ static Lisp_Object @@ -293,7 +293,7 @@ pop_kbd_macro (info) Lisp_Object info; { Lisp_Object tem; - Vexecuting_macro = XCAR (info); + Vexecuting_kbd_macro = XCAR (info); tem = XCDR (info); executing_macro_index = XINT (XCAR (tem)); real_this_command = XCDR (tem); @@ -330,7 +330,7 @@ each iteration of the macro. Iteration stops if LOOPFUNC returns nil. */) if (!STRINGP (final) && !VECTORP (final)) error ("Keyboard macros must be strings or vectors"); - tem = Fcons (Vexecuting_macro, + tem = Fcons (Vexecuting_kbd_macro, Fcons (make_number (executing_macro_index), real_this_command)); record_unwind_protect (pop_kbd_macro, tem); @@ -338,7 +338,7 @@ each iteration of the macro. Iteration stops if LOOPFUNC returns nil. */) GCPRO2 (final, loopfunc); do { - Vexecuting_macro = final; + Vexecuting_kbd_macro = final; executing_macro = final; executing_macro_index = 0; @@ -359,11 +359,11 @@ each iteration of the macro. Iteration stops if LOOPFUNC returns nil. */) QUIT; } while (--repeat - && (STRINGP (Vexecuting_macro) || VECTORP (Vexecuting_macro))); + && (STRINGP (Vexecuting_kbd_macro) || VECTORP (Vexecuting_kbd_macro))); executing_macro = Qnil; - real_this_command = Vexecuting_macro; + real_this_command = Vexecuting_kbd_macro; UNGCPRO; return unbind_to (pdlcount, Qnil); @@ -372,7 +372,7 @@ each iteration of the macro. Iteration stops if LOOPFUNC returns nil. */) void init_macros () { - Vexecuting_macro = Qnil; + Vexecuting_kbd_macro = Qnil; executing_macro = Qnil; } @@ -396,15 +396,13 @@ syms_of_macros () The value is the symbol `append' while appending to the definition of an existing macro. */); - DEFVAR_LISP ("executing-macro", &Vexecuting_macro, - doc: /* Currently executing keyboard macro (string or vector); nil if none executing. */); + DEFVAR_LISP ("executing-kbd-macro", &Vexecuting_kbd_macro, + 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, doc: /* Index in currently executing keyboard macro; undefined if none executing. */); - DEFVAR_LISP_NOPRO ("executing-kbd-macro", &Vexecuting_macro, - doc: /* Currently executing keyboard macro (string or vector); nil if none executing. */); - DEFVAR_KBOARD ("last-kbd-macro", Vlast_kbd_macro, doc: /* Last kbd macro defined, as a string or vector; nil if none defined. */); } -- 2.39.2