/* 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.
#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
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)))
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_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));
Fexecute_kbd_macro (KVAR (current_kboard, Vlast_kbd_macro),
make_number (1), Qnil);
- message ("Appending to kbd macro...");
+ message1 ("Appending to kbd macro...");
}
kset_defining_kbd_macro (current_kboard, Qt);
end_kbd_macro (void)
{
kset_defining_kbd_macro (current_kboard, Qnil);
- update_mode_lines++;
+ update_mode_lines = 20;
kset_last_kbd_macro
(current_kboard,
make_event_array ((current_kboard->kbd_macro_end
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)
/* 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;
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,