Commit 1e0b36be authored by Stefan Monnier's avatar Stefan Monnier

(Fcall_interactively): Use Finteractive_form.

parent c2f562ee
/* Call a Lisp function interactively.
Copyright (C) 1985, 86, 93, 94, 95, 1997, 2000, 02, 2003
Copyright (C) 1985, 86, 93, 94, 95, 1997, 2000, 02, 03, 2004
Free Software Foundation, Inc.
This file is part of GNU Emacs.
......@@ -347,25 +347,17 @@ supply if the command inquires which events were used to invoke it. */)
goto lose;
specs = XVECTOR (fun)->contents[COMPILED_INTERACTIVE];
}
else if (!CONSP (fun))
goto lose;
else if (funcar = XCAR (fun), EQ (funcar, Qautoload))
else
{
Lisp_Object form;
GCPRO2 (function, prefix_arg);
do_autoload (fun, function);
Finteractive_form (function);
UNGCPRO;
goto retry;
}
else if (EQ (funcar, Qlambda))
{
specs = Fassq (Qinteractive, Fcdr (XCDR (fun)));
if (NILP (specs))
goto lose;
filter_specs = Fnth (make_number (1), specs);
specs = Fcar (Fcdr (specs));
}
if (CONSP (form))
specs = filter_specs = Fcar (XCDR (form));
else
goto lose;
}
/* If either SPECS or STRING is set to a string, use it. */
if (STRINGP (specs))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment