aboutsummaryrefslogtreecommitdiffstats
path: root/src/eval.c
diff options
context:
space:
mode:
authorPhilipp Stephani2020-09-13 20:21:41 +0200
committerPhilipp Stephani2020-09-13 20:26:47 +0200
commitda0e75e7410226d7fd6d760f0ebe8a04d815506d (patch)
tree1c850a5c13e3af18b7ca8cfe1b785d51300d9dde /src/eval.c
parent3eb4e0db5ce247f8396daac3156087fbb7aefbd4 (diff)
downloademacs-da0e75e7410226d7fd6d760f0ebe8a04d815506d.tar.gz
emacs-da0e75e7410226d7fd6d760f0ebe8a04d815506d.zip
Add facility to make module functions interactive (Bug#23486).
* src/module-env-28.h: Add field for 'make_interactive' function. * src/emacs-module.c (Lisp_Module_Function): Add new field holding the interactive form. (allocate_module_function): Adapt to structure layout change. (module_make_interactive, module_function_interactive_form): New functions. (initialize_environment): Use them. * src/eval.c (Fcommandp): * src/data.c (Finteractive_form): Also handle interactive module functions. * test/data/emacs-module/mod-test.c (Fmod_test_identity): New test function. (emacs_module_init): Create two interactive module test functions. * test/src/emacs-module-tests.el (module/interactive/return-t) (module/interactive/return-t-int, module/interactive/identity): New unit tests. * doc/lispref/internals.texi (Module Functions): Document new function. Rework paragraph about wrapping module functions, as the example no longer applies. * etc/NEWS: Document new facility.
Diffstat (limited to 'src/eval.c')
-rw-r--r--src/eval.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/eval.c b/src/eval.c
index 126ee2e9555..fdc3cd1e9f4 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -1948,6 +1948,13 @@ 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 /* Module functions are interactive if their `interactive_form'
1952 field is non-nil. */
1953 else if (MODULE_FUNCTIONP (fun))
1954 return NILP (module_function_interactive_form (XMODULE_FUNCTION (fun)))
1955 ? if_prop
1956 : Qt;
1957
1951 /* Strings and vectors are keyboard macros. */ 1958 /* Strings and vectors are keyboard macros. */
1952 if (STRINGP (fun) || VECTORP (fun)) 1959 if (STRINGP (fun) || VECTORP (fun))
1953 return (NILP (for_call_interactively) ? Qt : Qnil); 1960 return (NILP (for_call_interactively) ? Qt : Qnil);