update.

[chise/xemacs-chise.git.1] / src / macros.c

diff --git a/src/macros.c b/src/macros.c
index d4c6260..62fb350 100644 (file)
--- a/src/macros.c
+++ b/src/macros.c
@@ -105,7 +105,7 @@ An argument of zero means repeat until error.
   int repeat;
 
   if (NILP (con->defining_kbd_macro))
-    error ("Not defining kbd macro.");
+    error ("Not defining kbd macro");
 
   if (NILP (arg))
     repeat = -1;
@@ -179,7 +179,7 @@ store_kbd_macro_event (Lisp_Object event)
 void
 pop_kbd_macro_event (Lisp_Object event)
 {
-  if (NILP (Vexecuting_macro)) abort ();
+  if (NILP (Vexecuting_macro)) ABORT ();
 
   if (STRINGP (Vexecuting_macro) || VECTORP (Vexecuting_macro))
     {
@@ -257,7 +257,7 @@ 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.
 */
-       (macro, prefixarg))
+       (macro, count))
 {
   /* This function can GC */
   Lisp_Object final;
@@ -267,15 +267,15 @@ COUNT is a repeat count, or nil for once, or 0 for infinite loop.
   struct gcpro gcpro1;
   struct console *con = XCONSOLE (Vselected_console);
 
-  if (!NILP (prefixarg))
+  if (!NILP (count))
     {
-      prefixarg = Fprefix_numeric_value (prefixarg);
-      repeat = XINT (prefixarg);
+      count = Fprefix_numeric_value (count);
+      repeat = XINT (count);
     }
 
   final = indirect_function (macro, 1);
   if (!STRINGP (final) && !VECTORP (final))
-    error ("Keyboard macros must be strings or vectors.");
+    error ("Keyboard macros must be strings or vectors");
 
   tem = Fcons (Vexecuting_macro, make_int (executing_macro_index));
   record_unwind_protect (pop_kbd_macro, tem);