diff options
| author | Philipp Stephani | 2020-09-13 20:21:41 +0200 |
|---|---|---|
| committer | Philipp Stephani | 2020-09-13 20:26:47 +0200 |
| commit | da0e75e7410226d7fd6d760f0ebe8a04d815506d (patch) | |
| tree | 1c850a5c13e3af18b7ca8cfe1b785d51300d9dde /test/src | |
| parent | 3eb4e0db5ce247f8396daac3156087fbb7aefbd4 (diff) | |
| download | emacs-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 'test/src')
| -rw-r--r-- | test/src/emacs-module-tests.el | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/test/src/emacs-module-tests.el b/test/src/emacs-module-tests.el index 096c6b30574..1eebb418cf3 100644 --- a/test/src/emacs-module-tests.el +++ b/test/src/emacs-module-tests.el | |||
| @@ -468,4 +468,36 @@ See Bug#36226." | |||
| 468 | (should (equal (buffer-string) "data from thread"))) | 468 | (should (equal (buffer-string) "data from thread"))) |
| 469 | (delete-process process))))) | 469 | (delete-process process))))) |
| 470 | 470 | ||
| 471 | (ert-deftest module/interactive/return-t () | ||
| 472 | (should (functionp (symbol-function #'mod-test-return-t))) | ||
| 473 | (should (module-function-p (symbol-function #'mod-test-return-t))) | ||
| 474 | (should-not (commandp #'mod-test-return-t)) | ||
| 475 | (should-not (commandp (symbol-function #'mod-test-return-t))) | ||
| 476 | (should-not (interactive-form #'mod-test-return-t)) | ||
| 477 | (should-not (interactive-form (symbol-function #'mod-test-return-t))) | ||
| 478 | (should-error (call-interactively #'mod-test-return-t) | ||
| 479 | :type 'wrong-type-argument)) | ||
| 480 | |||
| 481 | (ert-deftest module/interactive/return-t-int () | ||
| 482 | (should (functionp (symbol-function #'mod-test-return-t-int))) | ||
| 483 | (should (module-function-p (symbol-function #'mod-test-return-t-int))) | ||
| 484 | (should (commandp #'mod-test-return-t-int)) | ||
| 485 | (should (commandp (symbol-function #'mod-test-return-t-int))) | ||
| 486 | (should (equal (interactive-form #'mod-test-return-t-int) '(interactive))) | ||
| 487 | (should (equal (interactive-form (symbol-function #'mod-test-return-t-int)) | ||
| 488 | '(interactive))) | ||
| 489 | (should (eq (mod-test-return-t-int) t)) | ||
| 490 | (should (eq (call-interactively #'mod-test-return-t-int) t))) | ||
| 491 | |||
| 492 | (ert-deftest module/interactive/identity () | ||
| 493 | (should (functionp (symbol-function #'mod-test-identity))) | ||
| 494 | (should (module-function-p (symbol-function #'mod-test-identity))) | ||
| 495 | (should (commandp #'mod-test-identity)) | ||
| 496 | (should (commandp (symbol-function #'mod-test-identity))) | ||
| 497 | (should (equal (interactive-form #'mod-test-identity) '(interactive "i"))) | ||
| 498 | (should (equal (interactive-form (symbol-function #'mod-test-identity)) | ||
| 499 | '(interactive "i"))) | ||
| 500 | (should (eq (mod-test-identity 123) 123)) | ||
| 501 | (should-not (call-interactively #'mod-test-identity))) | ||
| 502 | |||
| 471 | ;;; emacs-module-tests.el ends here | 503 | ;;; emacs-module-tests.el ends here |