branch: externals/org
commit 0dd2c5ea399145fb716a1d070bf56c0495346639
Merge: a8443f2c79 d5b98bcfb5
Author: Ihor Radchenko <[email protected]>
Commit: Ihor Radchenko <[email protected]>
Merge branch 'bugfix'
---
lisp/org.el | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lisp/org.el b/lisp/org.el
index ad2394ae3b..d7d6a98b13 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -8938,7 +8938,7 @@ TYPE is the dynamic block type, as a string."
(defun org-dynamic-block-define (type func)
"Define dynamic block TYPE with FUNC.
TYPE is a string. FUNC is the function creating the dynamic
-block of such type."
+block of such type. FUNC must be able to accept zero arguments."
(pcase (assoc type org-dynamic-block-alist)
(`nil (push (cons type func) org-dynamic-block-alist))
(def (setcdr def func))))
@@ -8954,7 +8954,7 @@ is non-nil, call the dynamic block function
interactively."
(pcase (org-dynamic-block-function type)
(`nil (error "No such dynamic block: %S" type))
((and f (pred functionp))
- (if interactive-p (call-interactively f) (funcall f)))
+ (if (and interactive-p (commandp f)) (call-interactively f) (funcall f)))
(_ (error "Invalid function for dynamic block %S" type))))
(defun org-dblock-update (&optional arg)
