aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKarl Heuer1996-01-09 02:34:30 +0000
committerKarl Heuer1996-01-09 02:34:30 +0000
commit52d9c1459d45ca1f37ba1a7c9baf159f34522a49 (patch)
tree283b29bb0476bb04bec23bb81f3a3af5e0aacad7 /src
parent54ee42dd61458c3bae404a08d4a4da1b619525fc (diff)
downloademacs-52d9c1459d45ca1f37ba1a7c9baf159f34522a49.tar.gz
emacs-52d9c1459d45ca1f37ba1a7c9baf159f34522a49.zip
(Fexecute_kbd_macro): Local var `pdlcount' renamed from
`count' to remove collision with recently renamed argument.
Diffstat (limited to 'src')
-rw-r--r--src/macros.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/macros.c b/src/macros.c
index cd1c79071c0..80e3025a9a8 100644
--- a/src/macros.c
+++ b/src/macros.c
@@ -208,13 +208,14 @@ COUNT is a repeat count, or nil for once, or 0 for infinite loop.")
208{ 208{
209 Lisp_Object final; 209 Lisp_Object final;
210 Lisp_Object tem; 210 Lisp_Object tem;
211 int count = specpdl_ptr - specpdl; 211 int pdlcount = specpdl_ptr - specpdl;
212 int repeat = 1; 212 int repeat = 1;
213 struct gcpro gcpro1; 213 struct gcpro gcpro1;
214 214
215 if (!NILP (count)) 215 if (!NILP (count)) {
216 count = Fprefix_numeric_value (count), 216 count = Fprefix_numeric_value (count);
217 repeat = XINT (count); 217 repeat = XINT (count);
218 }
218 219
219 final = indirect_function (macro); 220 final = indirect_function (macro);
220 if (!STRINGP (final) && !VECTORP (final)) 221 if (!STRINGP (final) && !VECTORP (final))
@@ -239,7 +240,7 @@ COUNT is a repeat count, or nil for once, or 0 for infinite loop.")
239 && (STRINGP (Vexecuting_macro) || VECTORP (Vexecuting_macro))); 240 && (STRINGP (Vexecuting_macro) || VECTORP (Vexecuting_macro)));
240 241
241 UNGCPRO; 242 UNGCPRO;
242 return unbind_to (count, Qnil); 243 return unbind_to (pdlcount, Qnil);
243} 244}
244 245
245init_macros () 246init_macros ()