Browse Source

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

This reverts commit 78ec8da52a3353117282e3dbf0d3d4f74a76f917.
Bastien 5 năm trước cách đây
mục cha
commit
5af2d215ff
1 tập tin đã thay đổi với 1 bổ sung7 xóa
  1. 1 7
      lisp/org-capture.el

+ 1 - 7
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 "\\[\\[\\(.*?\\)\\]\\(\\[.*?\\]\\)?\\]")