diff options
| author | Glenn Morris | 2020-09-13 17:19:19 -0700 |
|---|---|---|
| committer | Glenn Morris | 2020-09-13 17:19:19 -0700 |
| commit | 1c84b187abc3ca60ae1a93522ddbad5af6cfd595 (patch) | |
| tree | add2029e5e94367d0e5141668de0362e2a6e428f /src | |
| parent | 1749d32d027da2d3c52301bd84a4dcfb70694d51 (diff) | |
| download | emacs-1c84b187abc3ca60ae1a93522ddbad5af6cfd595.tar.gz emacs-1c84b187abc3ca60ae1a93522ddbad5af6cfd595.zip | |
Fix builds without modules
* src/data.c (Finteractive_form):
* src/eval.c (Fcommandp): Fix builds without modules.
Diffstat (limited to 'src')
| -rw-r--r-- | src/data.c | 2 | ||||
| -rw-r--r-- | src/eval.c | 2 |
2 files changed, 4 insertions, 0 deletions
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). */) | |||
| 906 | if (PVSIZE (fun) > COMPILED_INTERACTIVE) | 906 | if (PVSIZE (fun) > COMPILED_INTERACTIVE) |
| 907 | return list2 (Qinteractive, AREF (fun, COMPILED_INTERACTIVE)); | 907 | return list2 (Qinteractive, AREF (fun, COMPILED_INTERACTIVE)); |
| 908 | } | 908 | } |
| 909 | #ifdef HAVE_MODULES | ||
| 909 | else if (MODULE_FUNCTIONP (fun)) | 910 | else if (MODULE_FUNCTIONP (fun)) |
| 910 | { | 911 | { |
| 911 | Lisp_Object form | 912 | Lisp_Object form |
| @@ -913,6 +914,7 @@ Value, if non-nil, is a list (interactive SPEC). */) | |||
| 913 | if (! NILP (form)) | 914 | if (! NILP (form)) |
| 914 | return form; | 915 | return form; |
| 915 | } | 916 | } |
| 917 | #endif | ||
| 916 | else if (AUTOLOADP (fun)) | 918 | else if (AUTOLOADP (fun)) |
| 917 | return Finteractive_form (Fautoload_do_load (fun, cmd, Qnil)); | 919 | return Finteractive_form (Fautoload_do_load (fun, cmd, Qnil)); |
| 918 | else if (CONSP (fun)) | 920 | 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. */) | |||
| 1948 | else if (COMPILEDP (fun)) | 1948 | else if (COMPILEDP (fun)) |
| 1949 | return (PVSIZE (fun) > COMPILED_INTERACTIVE ? Qt : if_prop); | 1949 | return (PVSIZE (fun) > COMPILED_INTERACTIVE ? Qt : if_prop); |
| 1950 | 1950 | ||
| 1951 | #ifdef HAVE_MODULES | ||
| 1951 | /* Module functions are interactive if their `interactive_form' | 1952 | /* Module functions are interactive if their `interactive_form' |
| 1952 | field is non-nil. */ | 1953 | field is non-nil. */ |
| 1953 | else if (MODULE_FUNCTIONP (fun)) | 1954 | else if (MODULE_FUNCTIONP (fun)) |
| 1954 | return NILP (module_function_interactive_form (XMODULE_FUNCTION (fun))) | 1955 | return NILP (module_function_interactive_form (XMODULE_FUNCTION (fun))) |
| 1955 | ? if_prop | 1956 | ? if_prop |
| 1956 | : Qt; | 1957 | : Qt; |
| 1958 | #endif | ||
| 1957 | 1959 | ||
| 1958 | /* Strings and vectors are keyboard macros. */ | 1960 | /* Strings and vectors are keyboard macros. */ |
| 1959 | if (STRINGP (fun) || VECTORP (fun)) | 1961 | if (STRINGP (fun) || VECTORP (fun)) |