Merge remote-tracking branch 'savannah/master' into HEAD

1 files changed, 9 insertions, 0 deletions

diff --git a/src/eval.c b/src/eval.c
index 71b7ac8f84e..9e0cec6d9e5 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -2012,6 +2012,15 @@ then strings and vectors are not accepted.  */)
   else if (COMPILEDP (fun))
     return (PVSIZE (fun) > COMPILED_INTERACTIVE ? Qt : if_prop);
 
+#ifdef HAVE_MODULES
+  /* Module functions are interactive if their `interactive_form'
+     field is non-nil. */
+  else if (MODULE_FUNCTIONP (fun))
+    return NILP (module_function_interactive_form (XMODULE_FUNCTION (fun)))
+             ? if_prop
+             : Qt;
+#endif
+
   /* Strings and vectors are keyboard macros.  */
   if (STRINGP (fun) || VECTORP (fun))
     return (NILP (for_call_interactively) ? Qt : Qnil);