Lisp_Object Qlet, QletX, Qsave_excursion;
-Lisp_Object Qcurrent_prefix_arg;
-
-Lisp_Object Quser_variable_p;
Lisp_Object Qread_from_minibuffer;
Lisp_Object Qread_file_name;
Lisp_Object Qread_directory_name;
}
else if (COMPILED_FUNCTIONP (fun))
{
- struct Lisp_Compiled_Function *b = XCOMPILED_FUNCTION (fun);
- if (!(b->flags.interactivep))
+ Lisp_Compiled_Function *f = XCOMPILED_FUNCTION (fun);
+ if (! f->flags.interactivep)
goto lose;
- specs = compiled_function_interactive (b);
+ specs = compiled_function_interactive (f);
}
else if (!CONSP (fun))
goto lose;
{
Lisp_Object domain = Qnil;
if (COMPILED_FUNCTIONP (fun))
- domain = Fcompiled_function_domain (fun);
+ domain = compiled_function_domain (XCOMPILED_FUNCTION (fun));
if (NILP (domain))
specs = Fgettext (specs);
else
struct gcpro gcpro1;
GCPRO1 (fun);
- fun = funcall_recording_as (function, 1, &fun);
+ fun = Ffuncall (1, &fun);
UNGCPRO;
}
if (set_zmacs_region_stays)
}
case 'k': /* Key sequence (vector of events) */
{
- Lisp_Object tem = Fread_key_sequence (PROMPT (), Qnil, Qnil);
+ struct gcpro ngcpro1;
+ Lisp_Object tem;
+ Lisp_Object key_prompt = PROMPT ();
+
+ NGCPRO1(key_prompt);
+ tem = Fread_key_sequence (key_prompt, Qnil, Qnil);
+ NUNGCPRO;
+
visargs[argnum] = Fkey_description (tem);
/* The following makes `describe-key' not work with
extent-local keymaps and such; and anyway, it's
case 'K': /* Key sequence (vector of events),
no automatic downcasing */
{
- Lisp_Object tem = Fread_key_sequence (PROMPT (), Qnil, Qt);
+ struct gcpro ngcpro1;
+ Lisp_Object tem;
+ Lisp_Object key_prompt = PROMPT ();
+
+ NGCPRO1(key_prompt);
+ tem = Fread_key_sequence (key_prompt, Qnil, Qt);
+ NUNGCPRO;
+
visargs[argnum] = Fkey_description (tem);
/* The following makes `describe-key' not work with
extent-local keymaps and such; and anyway, it's
defsymbol (&Qevents_to_keys, "events-to-keys");
defsymbol (&Qcommand_debug_status, "command-debug-status");
defsymbol (&Qenable_recursive_minibuffers, "enable-recursive-minibuffers");
- defsymbol (&Quser_variable_p, "user-variable-p");
- defsymbol (&Qcurrent_prefix_arg, "current-prefix-arg");
defsymbol (&Qlet, "let");
defsymbol (&QletX, "let*");