*** empty log message ***

[gnu-emacs] / src / callint.c

diff --git a/src/callint.c b/src/callint.c
index 741f61d068bde148bd70863815c029b8b16a93d1..392b6f00eecd69de4c1e5c86b65fdf436de3ff6c 100644 (file)
--- a/src/callint.c
+++ b/src/callint.c
@@ -174,7 +174,7 @@ check_mark (for_region)
           : "The mark is not set now");
   if (!NILP (Vtransient_mark_mode) && NILP (Vmark_even_if_inactive)
       && NILP (current_buffer->mark_active))
-    Fsignal (Qmark_inactive, Qnil);
+    xsignal0 (Qmark_inactive);
 }
 
 /* If the list of args INPUT was produced with an explicit call to
@@ -257,9 +257,11 @@ See `interactive'.
 Optional second arg RECORD-FLAG non-nil
 means unconditionally put this command in the command-history.
 Otherwise, this is done only if an arg is read using the minibuffer.
+
 Optional third arg KEYS, if given, specifies the sequence of events to
-supply if the command inquires which events were used to invoke it.
-If KEYS is omitted or nil, the return value of `this-command-keys' is used.  */)
+supply, as a vector, if the command inquires which events were used to
+invoke it.  If KEYS is omitted or nil, the return value of
+`this-command-keys-vector' is used.  */)
      (function, record_flag, keys)
      Lisp_Object function, record_flag, keys;
 {
@@ -314,8 +316,6 @@ If KEYS is omitted or nil, the return value of `this-command-keys' is used.  */)
   /* Save this now, since use of minibuffer will clobber it. */
   prefix_arg = Vcurrent_prefix_arg;
 
- retry:
-
   if (SYMBOLP (function))
     enable = Fget (function, Qenable_recursive_minibuffers);
   else
@@ -334,8 +334,7 @@ If KEYS is omitted or nil, the return value of `this-command-keys' is used.  */)
   up_event = Qnil;
 
   /* Decode the kind of function.  Either handle it and return,
-     or go to `lose' if not interactive, or go to `retry'
-     to specify a different function, or set either STRING or SPECS.  */
+     or go to `lose' if not interactive, or set either STRING or SPECS.  */
 
   if (SUBRP (fun))
     {
@@ -343,8 +342,7 @@ If KEYS is omitted or nil, the return value of `this-command-keys' is used.  */)
       if (!string)
        {
        lose:
-         function = wrong_type_argument (Qcommandp, function);
-         goto retry;
+         wrong_type_argument (Qcommandp, function);
        }
     }
   else if (COMPILEDP (fun))
@@ -567,7 +565,7 @@ If KEYS is omitted or nil, the return value of `this-command-keys' is used.  */)
          break;
 
         case 'c':              /* Character */
-         args[i] = Fread_char (build_string (callint_message), Qnil);
+         args[i] = Fread_char (build_string (callint_message), Qnil, Qnil);
          message1_nolog ((char *) 0);
          /* Passing args[i] directly stimulates compiler bug */
          teml = args[i];
@@ -639,7 +637,7 @@ If KEYS is omitted or nil, the return value of `this-command-keys' is used.  */)
                /* Ignore first element, which is the base key.  */
                tem2 = Fmemq (intern ("down"), Fcdr (teml));
                if (! NILP (tem2))
-                 up_event = Fread_event (Qnil, Qnil);
+                 up_event = Fread_event (Qnil, Qnil, Qnil);
              }
          }
          break;
@@ -667,7 +665,7 @@ If KEYS is omitted or nil, the return value of `this-command-keys' is used.  */)
                /* Ignore first element, which is the base key.  */
                tem2 = Fmemq (intern ("down"), Fcdr (teml));
                if (! NILP (tem2))
-                 up_event = Fread_event (Qnil, Qnil);
+                 up_event = Fread_event (Qnil, Qnil, Qnil);
              }
          }
          break;