X-Git-Url: https://git.hcoop.net/bpt/emacs.git/blobdiff_plain/98c6f1e36ff487925280fa0b0340af9d058632b5..2bfa3d3e1fb347ba76bddf77f3e288049635821d:/src/macros.c
diff --git a/src/macros.c b/src/macros.c
index a07d8ddbd2..d82ec8bb82 100644
--- a/src/macros.c
+++ b/src/macros.c
@@ -1,6 +1,6 @@
/* Keyboard macros.
-Copyright (C) 1985-1986, 1993, 2000-2012 Free Software Foundation, Inc.
+Copyright (C) 1985-1986, 1993, 2000-2014 Free Software Foundation, Inc.
This file is part of GNU Emacs.
@@ -19,7 +19,7 @@ along with GNU Emacs. If not, see . */
#include
-#include
+
#include "lisp.h"
#include "macros.h"
#include "commands.h"
@@ -28,7 +28,7 @@ along with GNU Emacs. If not, see . */
#include "window.h"
#include "keyboard.h"
-Lisp_Object Qexecute_kbd_macro;
+static Lisp_Object Qexecute_kbd_macro;
static Lisp_Object Qkbd_macro_termination_hook;
/* Number of successful iterations so far
@@ -45,8 +45,6 @@ EMACS_INT executing_kbd_macro_iterations;
Lisp_Object executing_kbd_macro;
-Lisp_Object Fexecute_kbd_macro (Lisp_Object macro, Lisp_Object count, Lisp_Object loopfunc);
-
DEFUN ("start-kbd-macro", Fstart_kbd_macro, Sstart_kbd_macro, 1, 2, "P",
doc: /* Record subsequent keyboard input, defining a keyboard macro.
The commands are recorded even as they are executed.
@@ -55,7 +53,7 @@ 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
-macro before appending to it. */)
+macro before appending to it. */)
(Lisp_Object append, Lisp_Object no_exec)
{
if (!NILP (KVAR (current_kboard, defining_kbd_macro)))
@@ -63,28 +61,28 @@ macro before appending to it. */)
if (!current_kboard->kbd_macro_buffer)
{
- current_kboard->kbd_macro_buffer = xmalloc (30 * sizeof (Lisp_Object));
+ current_kboard->kbd_macro_buffer = xmalloc (30 * word_size);
current_kboard->kbd_macro_bufsize = 30;
}
- update_mode_lines++;
+ update_mode_lines = 19;
if (NILP (append))
{
if (current_kboard->kbd_macro_bufsize > 200)
{
current_kboard->kbd_macro_buffer
= xrealloc (current_kboard->kbd_macro_buffer,
- 30 * sizeof (Lisp_Object));
+ 30 * word_size);
current_kboard->kbd_macro_bufsize = 30;
}
current_kboard->kbd_macro_ptr = current_kboard->kbd_macro_buffer;
current_kboard->kbd_macro_end = current_kboard->kbd_macro_buffer;
- message ("Defining kbd macro...");
+ message1 ("Defining kbd macro...");
}
else
{
ptrdiff_t i;
EMACS_INT len;
- int cvt;
+ bool cvt;
/* Check the type of last-kbd-macro in case Lisp code changed it. */
CHECK_VECTOR_OR_STRING (KVAR (current_kboard, Vlast_kbd_macro));
@@ -125,9 +123,9 @@ macro before appending to it. */)
Fexecute_kbd_macro (KVAR (current_kboard, Vlast_kbd_macro),
make_number (1), Qnil);
- message ("Appending to kbd macro...");
+ message1 ("Appending to kbd macro...");
}
- KVAR (current_kboard, defining_kbd_macro) = Qt;
+ kset_defining_kbd_macro (current_kboard, Qt);
return Qnil;
}
@@ -137,12 +135,13 @@ macro before appending to it. */)
void
end_kbd_macro (void)
{
- KVAR (current_kboard, defining_kbd_macro) = Qnil;
- update_mode_lines++;
- KVAR (current_kboard, Vlast_kbd_macro)
- = make_event_array ((current_kboard->kbd_macro_end
- - current_kboard->kbd_macro_buffer),
- current_kboard->kbd_macro_buffer);
+ kset_defining_kbd_macro (current_kboard, Qnil);
+ update_mode_lines = 20;
+ kset_last_kbd_macro
+ (current_kboard,
+ 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",
@@ -171,21 +170,21 @@ each iteration of the macro. Iteration stops if LOOPFUNC returns nil. */)
if (!NILP (KVAR (current_kboard, defining_kbd_macro)))
{
end_kbd_macro ();
- message ("Keyboard macro defined");
+ message1 ("Keyboard macro defined");
}
if (XFASTINT (repeat) == 0)
Fexecute_kbd_macro (KVAR (current_kboard, Vlast_kbd_macro), repeat, loopfunc);
else if (XINT (repeat) > 1)
{
- XSETINT (repeat, XINT (repeat)-1);
+ XSETINT (repeat, XINT (repeat) - 1);
Fexecute_kbd_macro (KVAR (current_kboard, Vlast_kbd_macro),
repeat, loopfunc);
}
return Qnil;
}
-/* Store character c into kbd macro being defined */
+/* Store character c into kbd macro being defined. */
void
store_kbd_macro_char (Lisp_Object c)
@@ -278,7 +277,7 @@ each iteration of the macro. Iteration stops if LOOPFUNC returns nil. */)
/* Restore Vexecuting_kbd_macro and executing_kbd_macro_index.
Called when the unwind-protect in Fexecute_kbd_macro gets invoked. */
-static Lisp_Object
+static void
pop_kbd_macro (Lisp_Object info)
{
Lisp_Object tem;
@@ -287,12 +286,12 @@ pop_kbd_macro (Lisp_Object info)
executing_kbd_macro_index = XINT (XCAR (tem));
Vreal_this_command = XCDR (tem);
Frun_hooks (1, &Qkbd_macro_termination_hook);
- return Qnil;
}
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.
+MACRO can also be a vector of keyboard events. If MACRO is a symbol,
+its function definition is used.
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
@@ -301,7 +300,7 @@ each iteration of the macro. Iteration stops if LOOPFUNC returns nil. */)
{
Lisp_Object final;
Lisp_Object tem;
- ptrdiff_t pdlcount = SPECPDL_INDEX ();
+ dynwind_begin ();
EMACS_INT repeat = 1;
struct gcpro gcpro1, gcpro2;
EMACS_INT success_count = 0;
@@ -330,7 +329,7 @@ each iteration of the macro. Iteration stops if LOOPFUNC returns nil. */)
executing_kbd_macro = final;
executing_kbd_macro_index = 0;
- KVAR (current_kboard, Vprefix_arg) = Qnil;
+ kset_prefix_arg (current_kboard, Qnil);
if (!NILP (loopfunc))
{
@@ -354,7 +353,8 @@ each iteration of the macro. Iteration stops if LOOPFUNC returns nil. */)
Vreal_this_command = Vexecuting_kbd_macro;
UNGCPRO;
- return unbind_to (pdlcount, Qnil);
+ dynwind_end ();
+ return Qnil;
}
void
@@ -367,6 +367,8 @@ init_macros (void)
void
syms_of_macros (void)
{
+#include "macros.x"
+
DEFSYM (Qexecute_kbd_macro, "execute-kbd-macro");
DEFVAR_LISP ("kbd-macro-termination-hook", Vkbd_macro_termination_hook,
@@ -375,13 +377,6 @@ This is run whether the macro ends normally or prematurely due to an error. */)
Vkbd_macro_termination_hook = Qnil;
DEFSYM (Qkbd_macro_termination_hook, "kbd-macro-termination-hook");
- defsubr (&Sstart_kbd_macro);
- defsubr (&Send_kbd_macro);
- defsubr (&Scall_last_kbd_macro);
- defsubr (&Sexecute_kbd_macro);
- defsubr (&Scancel_kbd_macro_events);
- 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!
The value is the symbol `append' while appending to the definition of