From: Glenn Morris <rgm@gnu.org>
Date: Mon, 14 Sep 2020 00:19:19 +0000 (-0700)
Subject: Fix builds without modules
X-Git-Tag: emacs-28.0.90~6073
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1c84b187abc3ca60ae1a93522ddbad5af6cfd595;p=emacs.git

Fix builds without modules

* src/data.c (Finteractive_form):
* src/eval.c (Fcommandp): Fix builds without modules.
---

diff --git a/src/data.c b/src/data.c
index dae8b10ef55..65589856687 100644
--- a/src/data.c
+++ b/src/data.c
@@ -906,6 +906,7 @@ Value, if non-nil, is a list (interactive SPEC).  */)
       if (PVSIZE (fun) > COMPILED_INTERACTIVE)
 	return list2 (Qinteractive, AREF (fun, COMPILED_INTERACTIVE));
     }
+#ifdef HAVE_MODULES
   else if (MODULE_FUNCTIONP (fun))
     {
       Lisp_Object form
@@ -913,6 +914,7 @@ Value, if non-nil, is a list (interactive SPEC).  */)
       if (! NILP (form))
         return form;
     }
+#endif
   else if (AUTOLOADP (fun))
     return Finteractive_form (Fautoload_do_load (fun, cmd, Qnil));
   else if (CONSP (fun))
diff --git a/src/eval.c b/src/eval.c
index fdc3cd1e9f4..5d3c32326db 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -1948,12 +1948,14 @@ 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))