(Finteractive_form): Use a `interactive-form' property if

present, analogous to the function-documentation property.

2 files changed, 13 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index ac6b24aaffa..bfdf9abb5d2 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-25  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * data.c (Finteractive_form): Use a `interactive-form' property if
+        present, analogous to the function-documentation property.
+
 2007-07-22  Nick Roberts  <nickrob@snap.net.nz>
 
         * xdisp.c (decode_mode_spec): Add case 'R' for to test for
diff --git a/src/data.c b/src/data.c
index 0b3be2fc694..f705aa559e8 100644
--- a/src/data.c
+++ b/src/data.c
@@ -751,8 +751,14 @@ Value, if non-nil, is a list \(interactive SPEC).  */)
      Lisp_Object cmd;
 {
   Lisp_Object fun = indirect_function (cmd);
-
-  if (SUBRP (fun))
+  Lisp_Object tmp;
+
+  if (SYMBOLP (cmd)
+      /* Use an `interactive-form' property if present, analogous to the
+         function-documentation property. */
+      && (tmp = Fget (cmd, intern ("interactive-form")), !NILP (tmp)))
+    return tmp;
+  else if (SUBRP (fun))
     {
       if (XSUBR (fun)->prompt)
         return list2 (Qinteractive, build_string (XSUBR (fun)->prompt));