branch: externals/org
commit 8fe6c7c0223b7debd084970b3b6c4defe999d153
Merge: 332695e850 1003494111
Author: Ihor Radchenko <yanta...@posteo.net>
Commit: Ihor Radchenko <yanta...@posteo.net>
Merge branch 'bugfix'
---
doc/org-manual.org | 2 +-
lisp/org-capture.el | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/doc/org-manual.org b/doc/org-manual.org
index e4be10a3bd..5a40452717 100644
--- a/doc/org-manual.org
+++ b/doc/org-manual.org
@@ -7998,7 +7998,7 @@ configuration would look like:
(setq org-capture-templates
'(("t" "Todo" entry (file+headline "~/org/gtd.org" "Tasks")
"* TODO %?\n %i\n %a")
- ("j" "Journal" entry (file+datetree "~/org/journal.org")
+ ("j" "Journal" entry (file+olp+datetree "~/org/journal.org")
"* %?\nEntered on %U\n %i\n %a")))
#+end_src
diff --git a/lisp/org-capture.el b/lisp/org-capture.el
index b18418bd5d..b54cd02f0f 100644
--- a/lisp/org-capture.el
+++ b/lisp/org-capture.el
@@ -510,6 +510,7 @@ you can escape ambiguous cases with a backward slash, e.g.,
\\%i."
(function :tag " Function")))
(choice :tag "Template "
(string)
+ (const :tag "Empty" nil)
(list :tag "File"
(const :format "" file)
(file :tag "Template file"))
