Fix default personal org-capture targets

Supposed to resolve to {org-directory}/todo.org, but instead resolved to
{default-directory}/todo.org.
This commit is contained in:
Henrik Lissner 2019-03-13 18:22:57 -04:00
parent 4715412b5c
commit 79ac04f0b1
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
2 changed files with 15 additions and 1 deletions

View file

@ -21,7 +21,7 @@ Is relative to `org-directory', unless it is absolute. Is used in Doom's default
Is relative to `org-directory' unless it is absolute. Is used in Doom's default Is relative to `org-directory' unless it is absolute. Is used in Doom's default
`org-capture-templates'.") `org-capture-templates'.")
(defvaralias '+org-capture-notes-file 'org-default-notes-file (defvar +org-capture-notes-file "notes.org"
"Default target for storing notes. "Default target for storing notes.
Used as a fall back file for org-capture.el, for templates that do not specify a Used as a fall back file for org-capture.el, for templates that do not specify a
@ -30,6 +30,8 @@ target file.
Is relative to `org-directory', unless it is absolute. Is used in Doom's default Is relative to `org-directory', unless it is absolute. Is used in Doom's default
`org-capture-templates'.") `org-capture-templates'.")
(setq org-default-notes-file (expand-file-name +org-capture-notes-file org-directory))
;; ;;
;;; Bootstrap ;;; Bootstrap

View file

@ -85,6 +85,18 @@ you're done. This can be called from an external shell script."
(doom-project-root) (doom-project-root)
(user-error "Couldn't detect a project"))))) (user-error "Couldn't detect a project")))))
;;;###autoload
(defun +org-capture-todo-file ()
"Expand `+org-capture-todo-file' from `org-directory'.
If it is an absolute path return `+org-capture-todo-file' verbatim."
(expand-file-name +org-capture-todo-file org-directory))
;;;###autoload
(defun +org-capture-notes-file ()
"Expand `+org-capture-notes-file' from `org-directory'.
If it is an absolute path return `+org-capture-todo-file' verbatim."
(expand-file-name +org-capture-notes-file org-directory))
;;;###autoload ;;;###autoload
(defun +org-capture-project-todo-file () (defun +org-capture-project-todo-file ()
"Find the nearest `+org-capture-todo-file' in a parent directory, otherwise, "Find the nearest `+org-capture-todo-file' in a parent directory, otherwise,