(Fcall_interactively): Use Finteractive_form also for subrs

and compiled functions.

diff --git a/src/ChangeLog b/src/ChangeLog
index 228148472a5b858a833af9a3cdd25ffbf2ebd418..ce9eec41ce261220ec0ea8385c60999796d7f86a 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2007-09-10  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * callint.c (Fcall_interactively): Use Finteractive_form also for subrs
+       and compiled functions.
+
 2007-09-08  Fredrik Axelsson  <f.axelsson@gmail.com>
 
        * window.c (prefer_window_split_horizontally): New variable.

diff --git a/src/callint.c b/src/callint.c
index 57c86f0a63315713667bed58974917d8c8d61e12..2ad8f4457820e80c5ed409a89e21755a071d98f4 100644 (file)
--- a/src/callint.c
+++ b/src/callint.c
@@ -332,32 +332,16 @@ invoke it.  If KEYS is omitted or nil, the return value of
   /* Decode the kind of function.  Either handle it and return,
      or go to `lose' if not interactive, or set either STRING or SPECS.  */
 
-  if (SUBRP (fun))
-    {
-      string = (unsigned char *) XSUBR (fun)->prompt;
-      if (!string)
-       {
-       lose:
-         wrong_type_argument (Qcommandp, function);
-       }
-    }
-  else if (COMPILEDP (fun))
-    {
-      if ((XVECTOR (fun)->size & PSEUDOVECTOR_SIZE_MASK) <= COMPILED_INTERACTIVE)
-       goto lose;
-      specs = XVECTOR (fun)->contents[COMPILED_INTERACTIVE];
-    }
-  else
-    {
-      Lisp_Object form;
-      GCPRO2 (function, prefix_arg);
-      form = Finteractive_form (function);
-      UNGCPRO;
-      if (CONSP (form))
-       specs = filter_specs = Fcar (XCDR (form));
-      else
-       goto lose;
-    }
+  {
+    Lisp_Object form;
+    GCPRO2 (function, prefix_arg);
+    form = Finteractive_form (function);
+    UNGCPRO;
+    if (CONSP (form))
+      specs = filter_specs = Fcar (XCDR (form));
+    else
+      wrong_type_argument (Qcommandp, function);
+  }
 
   /* If either SPECS or STRING is set to a string, use it.  */
   if (STRINGP (specs))
@@ -368,7 +352,7 @@ invoke it.  If KEYS is omitted or nil, the return value of
       bcopy (SDATA (specs), string,
             SBYTES (specs) + 1);
     }
-  else if (string == 0)
+  else
     {
       Lisp_Object input;
       i = num_input_events;