summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien <bzg@gnu.org>2020-02-19 13:37:24 +0100
committerBastien <bzg@gnu.org>2020-02-19 13:37:24 +0100
commit5af2d215ff6684c6d43ec77b0fb3e3dd668e08cb (patch)
tree324c23c06bf395cf2bd5e36587dc37e4c364e489
parent0b9fcc603f491863f14f087e542c52a83dff08f5 (diff)
downloadorg-mode-5af2d215ff6684c6d43ec77b0fb3e3dd668e08cb.tar.gz
Revert "org-capture.el: Conditionally throw an error on missing annotation"
This reverts commit 78ec8da52a3353117282e3dbf0d3d4f74a76f917.
-rw-r--r--lisp/org-capture.el8
1 files changed, 1 insertions, 7 deletions
diff --git a/lisp/org-capture.el b/lisp/org-capture.el
index fac6030..87d4a25 100644
--- a/lisp/org-capture.el
+++ b/lisp/org-capture.el
@@ -1575,13 +1575,7 @@ The template may still contain \"%?\" for cursor positioning."
(let ((a (or (plist-get org-store-link-plist :annotation)
annotation
(org-capture-get :annotation)
- ;; When immediately finishing and %a cannot be
- ;; expanded, through a user error:
- (if (org-capture-get :immediate-finish)
- (user-error "Missing initial annotation in this template: %s"
- (replace-regexp-in-string
- "\n" " " (org-capture-get :template)))
- ""))))
+ "")))
;; Is the link empty? Then we do not want it...
(if (equal a "[[]]") "" a)))
(l-re "\\[\\[\\(.*?\\)\\]\\(\\[.*?\\]\\)?\\]")