mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-09-29 18:36:26 +00:00
org-capture.el: Don't throw an error abusively
* lisp/org-capture.el (org-capture-fill-template): Don't throw
a user error when immediately finishing a template from which
an initial annotation is missing, warn instead.
This fixes 78ec8da52a
. Thanks to Eric Fraga for reporting this.
This commit is contained in:
parent
4150832d43
commit
26ba4f7d7f
|
@ -1576,11 +1576,11 @@ The template may still contain \"%?\" for cursor positioning."
|
|||
annotation
|
||||
(org-capture-get :annotation)
|
||||
;; When immediately finishing and %a cannot be
|
||||
;; expanded, through a user error:
|
||||
;; expanded, warn the user:
|
||||
(if (org-capture-get :immediate-finish)
|
||||
(user-error "Missing initial annotation in this template: %s"
|
||||
(replace-regexp-in-string
|
||||
"\n" " " (org-capture-get :template)))
|
||||
(warn "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)))
|
||||
|
|
Loading…
Reference in a new issue