aboutsummaryrefslogtreecommitdiffstats
path: root/src/macros.c
diff options
context:
space:
mode:
authorErik Naggum1996-01-09 00:33:09 +0000
committerErik Naggum1996-01-09 00:33:09 +0000
commit86a3ca5e06b2a62b36f6403ba490c052f274bf28 (patch)
tree6c51e2b776ac47f405268aeac0487863b07012c4 /src/macros.c
parent88539837f7a9c8066d396aa118db0aae210d1b72 (diff)
downloademacs-86a3ca5e06b2a62b36f6403ba490c052f274bf28.tar.gz
emacs-86a3ca5e06b2a62b36f6403ba490c052f274bf28.zip
(Fend_kbd_macro, Fexecute_kbd_macro): Harmonize arguments with
documentation.
Diffstat (limited to 'src/macros.c')
-rw-r--r--src/macros.c30
1 files changed, 15 insertions, 15 deletions
diff --git a/src/macros.c b/src/macros.c
index bbf5661377c..cd1c79071c0 100644
--- a/src/macros.c
+++ b/src/macros.c
@@ -81,16 +81,16 @@ under that name.\n\
81With numeric arg, repeat macro now that many times,\n\ 81With numeric arg, repeat macro now that many times,\n\
82counting the definition just completed as the first repetition.\n\ 82counting the definition just completed as the first repetition.\n\
83An argument of zero means repeat until error.") 83An argument of zero means repeat until error.")
84 (arg) 84 (repeat)
85 Lisp_Object arg; 85 Lisp_Object repeat;
86{ 86{
87 if (NILP (current_kboard->defining_kbd_macro)) 87 if (NILP (current_kboard->defining_kbd_macro))
88 error ("Not defining kbd macro."); 88 error ("Not defining kbd macro.");
89 89
90 if (NILP (arg)) 90 if (NILP (repeat))
91 XSETFASTINT (arg, 1); 91 XSETFASTINT (repeat, 1);
92 else 92 else
93 CHECK_NUMBER (arg, 0); 93 CHECK_NUMBER (repeat, 0);
94 94
95 if (!NILP (current_kboard->defining_kbd_macro)) 95 if (!NILP (current_kboard->defining_kbd_macro))
96 { 96 {
@@ -103,13 +103,13 @@ An argument of zero means repeat until error.")
103 message("Keyboard macro defined"); 103 message("Keyboard macro defined");
104 } 104 }
105 105
106 if (XFASTINT (arg) == 0) 106 if (XFASTINT (repeat) == 0)
107 Fexecute_kbd_macro (current_kboard->Vlast_kbd_macro, arg); 107 Fexecute_kbd_macro (current_kboard->Vlast_kbd_macro, repeat);
108 else 108 else
109 { 109 {
110 XSETINT (arg, XINT (arg)-1); 110 XSETINT (repeat, XINT (repeat)-1);
111 if (XINT (arg) > 0) 111 if (XINT (repeat) > 0)
112 Fexecute_kbd_macro (current_kboard->Vlast_kbd_macro, arg); 112 Fexecute_kbd_macro (current_kboard->Vlast_kbd_macro, repeat);
113 } 113 }
114 return Qnil; 114 return Qnil;
115} 115}
@@ -203,8 +203,8 @@ DEFUN ("execute-kbd-macro", Fexecute_kbd_macro, Sexecute_kbd_macro, 1, 2, 0,
203 "Execute MACRO as string of editor command characters.\n\ 203 "Execute MACRO as string of editor command characters.\n\
204If MACRO is a symbol, its function definition is used.\n\ 204If MACRO is a symbol, its function definition is used.\n\
205COUNT is a repeat count, or nil for once, or 0 for infinite loop.") 205COUNT is a repeat count, or nil for once, or 0 for infinite loop.")
206 (macro, prefixarg) 206 (macro, count)
207 Lisp_Object macro, prefixarg; 207 Lisp_Object macro, count;
208{ 208{
209 Lisp_Object final; 209 Lisp_Object final;
210 Lisp_Object tem; 210 Lisp_Object tem;
@@ -212,9 +212,9 @@ COUNT is a repeat count, or nil for once, or 0 for infinite loop.")
212 int repeat = 1; 212 int repeat = 1;
213 struct gcpro gcpro1; 213 struct gcpro gcpro1;
214 214
215 if (!NILP (prefixarg)) 215 if (!NILP (count))
216 prefixarg = Fprefix_numeric_value (prefixarg), 216 count = Fprefix_numeric_value (count),
217 repeat = XINT (prefixarg); 217 repeat = XINT (count);
218 218
219 final = indirect_function (macro); 219 final = indirect_function (macro);
220 if (!STRINGP (final) && !VECTORP (final)) 220 if (!STRINGP (final) && !VECTORP (final))