ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "org-capture.el: Conditionally throw an error on missing annotation" 

This reverts commit 78ec8da52a.
This commit is contained in:
Bastien 2020-02-19 13:37:24 +01:00
parent 0b9fcc603f
commit 5af2d215ff
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lisp/org-capture.el
View File

@ -1575,13 +1575,7 @@ The template may still contain \"%?\" for cursor positioning."
(let ((a (or (plist-get org-store-link-plist :annotation) (let ((a (or (plist-get org-store-link-plist :annotation)
annotation annotation
(org-capture-get :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... ;; Is the link empty? Then we do not want it...
(if (equal a "[[]]") "" a))) (if (equal a "[[]]") "" a)))
(l-re "\\[\\[\\(.*?\\)\\]\\(\\[.*?\\]\\)?\\]") (l-re "\\[\\[\\(.*?\\)\\]\\(\\[.*?\\]\\)?\\]")