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

present, analogous to the function-documentation property.

1 files changed, 8 insertions, 2 deletions

diff --git a/src/data.c b/src/data.c
index 0b3be2fc69..f705aa559e 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));