aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKim F. Storm2006-07-12 13:14:38 +0000
committerKim F. Storm2006-07-12 13:14:38 +0000
commitb08b1fc936688f92c4d9edc487c3fd18ca6460a8 (patch)
tree603efdef34cb727938b19a462e011bcc9eecd15a /src
parentc616acb810400c81dc423735b41506670bc80839 (diff)
downloademacs-b08b1fc936688f92c4d9edc487c3fd18ca6460a8.tar.gz
emacs-b08b1fc936688f92c4d9edc487c3fd18ca6460a8.zip
(Fcall_interactively): Remove loop around wrong_type_argument.
Diffstat (limited to 'src')
-rw-r--r--src/callint.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/callint.c b/src/callint.c
index 741f61d068b..c594f27c8b8 100644
--- a/src/callint.c
+++ b/src/callint.c
@@ -314,8 +314,6 @@ If KEYS is omitted or nil, the return value of `this-command-keys' is used. */)
314 /* Save this now, since use of minibuffer will clobber it. */ 314 /* Save this now, since use of minibuffer will clobber it. */
315 prefix_arg = Vcurrent_prefix_arg; 315 prefix_arg = Vcurrent_prefix_arg;
316 316
317 retry:
318
319 if (SYMBOLP (function)) 317 if (SYMBOLP (function))
320 enable = Fget (function, Qenable_recursive_minibuffers); 318 enable = Fget (function, Qenable_recursive_minibuffers);
321 else 319 else
@@ -334,8 +332,7 @@ If KEYS is omitted or nil, the return value of `this-command-keys' is used. */)
334 up_event = Qnil; 332 up_event = Qnil;
335 333
336 /* Decode the kind of function. Either handle it and return, 334 /* Decode the kind of function. Either handle it and return,
337 or go to `lose' if not interactive, or go to `retry' 335 or go to `lose' if not interactive, or set either STRING or SPECS. */
338 to specify a different function, or set either STRING or SPECS. */
339 336
340 if (SUBRP (fun)) 337 if (SUBRP (fun))
341 { 338 {
@@ -343,8 +340,7 @@ If KEYS is omitted or nil, the return value of `this-command-keys' is used. */)
343 if (!string) 340 if (!string)
344 { 341 {
345 lose: 342 lose:
346 function = wrong_type_argument (Qcommandp, function); 343 wrong_type_argument (Qcommandp, function);
347 goto retry;
348 } 344 }
349 } 345 }
350 else if (COMPILEDP (fun)) 346 else if (COMPILEDP (fun))