XEmacs 21.2.20 "Yoko".

[chise/xemacs-chise.git-] / src / callint.c

diff --git a/src/callint.c b/src/callint.c
index d1cd907..2e6832a 100644 (file)
--- a/src/callint.c
+++ b/src/callint.c
@@ -58,9 +58,6 @@ Lisp_Object Vmouse_leave_buffer_hook, Qmouse_leave_buffer_hook;
 
 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;
@@ -294,10 +291,10 @@ when reading the arguments.
     }
   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;
@@ -405,7 +402,7 @@ when reading the arguments.
     {
       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
@@ -525,7 +522,7 @@ when reading the arguments.
        struct gcpro gcpro1;
 
        GCPRO1 (fun);
-       fun = funcall_recording_as (function, 1, &fun);
+       fun = Ffuncall (1, &fun);
        UNGCPRO;
       }
       if (set_zmacs_region_stays)
@@ -715,7 +712,14 @@ when reading the arguments.
             }
          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
@@ -728,7 +732,14 @@ when reading the arguments.
          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
@@ -981,8 +992,6 @@ syms_of_callint (void)
   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*");