X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/64799df53a76c22f39c1b1c50b68b31d25bd0b39..306cea3aee712f8b2d19b2bfd4011a2ecc9c1c2f:/src/macros.c diff --git a/src/macros.c b/src/macros.c index 456a6e31fa..ef3ff8c052 100644 --- a/src/macros.c +++ b/src/macros.c @@ -1,5 +1,6 @@ /* Keyboard macros. - Copyright (C) 1985, 1986, 1993, 2000, 2001 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1993, 2000, 2001, 2002, 2003, 2004, + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -15,8 +16,8 @@ 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, 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 @@ -31,25 +32,25 @@ 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. */ -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; @@ -62,7 +63,7 @@ Use \\[end-kbd-macro] to finish recording and make the macro available. Use \\[name-last-kbd-macro] to give it a permanent name. Non-nil arg (prefix arg) means append to last macro defined; this begins by re-executing that macro as if you typed it again. -If optional second arg, NO-EXEC, is non-nil, do not re-execute last +If optional second arg, NO-EXEC, is non-nil, do not re-execute last macro before appending to it. */) (append, no_exec) Lisp_Object append, no_exec; @@ -93,6 +94,7 @@ macro before appending to it. */) else { int i, len; + int cvt; /* Check the type of last-kbd-macro in case Lisp code changed it. */ if (!STRINGP (current_kboard->Vlast_kbd_macro) @@ -111,9 +113,17 @@ macro before appending to it. */) = (Lisp_Object *)xrealloc (current_kboard->kbd_macro_buffer, (len + 30) * sizeof (Lisp_Object)); } + + /* Must convert meta modifier when copying string to vector. */ + cvt = STRINGP (current_kboard->Vlast_kbd_macro); for (i = 0; i < len; i++) - current_kboard->kbd_macro_buffer[i] - = Faref (current_kboard->Vlast_kbd_macro, make_number (i)); + { + Lisp_Object c; + c = Faref (current_kboard->Vlast_kbd_macro, make_number (i)); + if (cvt && NATNUMP (c) && (XFASTINT (c) & 0x80)) + XSETFASTINT (c, CHAR_META | (XFASTINT (c) & ~0x80)); + current_kboard->kbd_macro_buffer[i] = c; + } current_kboard->kbd_macro_ptr = current_kboard->kbd_macro_buffer + len; current_kboard->kbd_macro_end = current_kboard->kbd_macro_ptr; @@ -127,10 +137,23 @@ macro before appending to it. */) message ("Appending to kbd macro..."); } current_kboard->defining_kbd_macro = Qt; - + return Qnil; } +/* Finish defining the current keyboard macro. */ + +void +end_kbd_macro () +{ + current_kboard->defining_kbd_macro = Qnil; + update_mode_lines++; + current_kboard->Vlast_kbd_macro + = make_event_array ((current_kboard->kbd_macro_end + - current_kboard->kbd_macro_buffer), + current_kboard->kbd_macro_buffer); +} + DEFUN ("end-kbd-macro", Fend_kbd_macro, Send_kbd_macro, 0, 2, "p", doc: /* Finish defining a keyboard macro. The definition was started by \\[start-kbd-macro]. @@ -142,7 +165,7 @@ With numeric arg, repeat macro now that many times, counting the definition just completed as the first repetition. An argument of zero means repeat until error. -In Lisp, optional second arg LOOPFUNC may be a function that is called prior to +In Lisp, optional second arg LOOPFUNC may be a function that is called prior to each iteration of the macro. Iteration stops if LOOPFUNC returns nil. */) (repeat, loopfunc) Lisp_Object repeat, loopfunc; @@ -157,12 +180,7 @@ each iteration of the macro. Iteration stops if LOOPFUNC returns nil. */) if (!NILP (current_kboard->defining_kbd_macro)) { - current_kboard->defining_kbd_macro = Qnil; - update_mode_lines++; - current_kboard->Vlast_kbd_macro - = make_event_array ((current_kboard->kbd_macro_end - - current_kboard->kbd_macro_buffer), - current_kboard->kbd_macro_buffer); + end_kbd_macro (); message ("Keyboard macro defined"); } @@ -190,7 +208,7 @@ store_kbd_macro_char (c) if (kb->kbd_macro_ptr - kb->kbd_macro_buffer == kb->kbd_macro_bufsize) { int ptr_offset, end_offset, nbytes; - + ptr_offset = kb->kbd_macro_ptr - kb->kbd_macro_buffer; end_offset = kb->kbd_macro_end - kb->kbd_macro_buffer; kb->kbd_macro_bufsize *= 2; @@ -200,7 +218,7 @@ store_kbd_macro_char (c) kb->kbd_macro_ptr = kb->kbd_macro_buffer + ptr_offset; kb->kbd_macro_end = kb->kbd_macro_buffer + end_offset; } - + *kb->kbd_macro_ptr++ = c; } } @@ -240,9 +258,9 @@ DEFUN ("call-last-kbd-macro", Fcall_last_kbd_macro, Scall_last_kbd_macro, A prefix argument serves as a repeat count. Zero means repeat until error. To make a macro permanent so you can call it even after -defining others, use \\[name-last-kbd-macro]. +defining others, use \\[name-last-kbd-macro]. -In Lisp, optional second arg LOOPFUNC may be a function that is called prior to +In Lisp, optional second arg LOOPFUNC may be a function that is called prior to each iteration of the macro. Iteration stops if LOOPFUNC returns nil. */) (prefix, loopfunc) Lisp_Object prefix, loopfunc; @@ -268,17 +286,17 @@ each iteration of the macro. Iteration stops if LOOPFUNC returns nil. */) return Qnil; } -/* Restore Vexecuting_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 info; { Lisp_Object tem; - Vexecuting_macro = XCAR (info); + 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; @@ -287,9 +305,9 @@ pop_kbd_macro (info) DEFUN ("execute-kbd-macro", Fexecute_kbd_macro, Sexecute_kbd_macro, 1, 3, 0, doc: /* Execute MACRO as string of editor command characters. If MACRO is a symbol, its function definition is used. -COUNT is a repeat count, or nil for once, or 0 for infinite loop. +COUNT is a repeat count, or nil for once, or 0 for infinite loop. -Optional third arg LOOPFUNC may be a function that is called prior to +Optional third arg LOOPFUNC may be a function that is called prior to each iteration of the macro. Iteration stops if LOOPFUNC returns nil. */) (macro, count, loopfunc) Lisp_Object macro, count, loopfunc; @@ -301,7 +319,7 @@ each iteration of the macro. Iteration stops if LOOPFUNC returns nil. */) struct gcpro gcpro1, gcpro2; int success_count = 0; - executing_macro_iterations = 0; + executing_kbd_macro_iterations = 0; if (!NILP (count)) { @@ -313,17 +331,17 @@ 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, - Fcons (make_number (executing_macro_index), + tem = Fcons (Vexecuting_kbd_macro, + Fcons (make_number (executing_kbd_macro_index), real_this_command)); record_unwind_protect (pop_kbd_macro, tem); GCPRO2 (final, loopfunc); do { - Vexecuting_macro = final; - executing_macro = final; - executing_macro_index = 0; + Vexecuting_kbd_macro = final; + executing_kbd_macro = final; + executing_kbd_macro_index = 0; current_kboard->Vprefix_arg = Qnil; @@ -337,16 +355,16 @@ each iteration of the macro. Iteration stops if LOOPFUNC returns nil. */) command_loop_1 (); - executing_macro_iterations = ++success_count; + executing_kbd_macro_iterations = ++success_count; QUIT; } while (--repeat - && (STRINGP (Vexecuting_macro) || VECTORP (Vexecuting_macro))); + && (STRINGP (Vexecuting_kbd_macro) || VECTORP (Vexecuting_kbd_macro))); - executing_macro = Qnil; + executing_kbd_macro = Qnil; - real_this_command = Vexecuting_macro; + real_this_command = Vexecuting_kbd_macro; UNGCPRO; return unbind_to (pdlcount, Qnil); @@ -355,8 +373,8 @@ each iteration of the macro. Iteration stops if LOOPFUNC returns nil. */) void init_macros () { - Vexecuting_macro = Qnil; - executing_macro = Qnil; + Vexecuting_kbd_macro = Qnil; + executing_kbd_macro = Qnil; } void @@ -375,17 +393,20 @@ syms_of_macros () defsubr (&Sstore_kbd_macro_event); DEFVAR_KBOARD ("defining-kbd-macro", defining_kbd_macro, - doc: /* Non-nil while a keyboard macro is being defined. Don't set this! */); + doc: /* Non-nil while a keyboard macro is being defined. Don't set this! +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, + DEFVAR_INT ("executing-kbd-macro-index", &executing_kbd_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. */); } + +/* arch-tag: d293fcc9-2266-4163-9198-7fa0de12ec9e + (do not change this comment) */