Merge pull request #4631 from samwhitlock/me_dev

Enabling user config override for org-id-locations-file
This commit is contained in:
Henrik Lissner 2021-02-07 23:53:24 -05:00 committed by GitHub
commit 0ab452980a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -67,7 +67,8 @@ Is relative to `org-directory', unless it is absolute. Is used in Doom's default
(defun +org-init-org-directory-h () (defun +org-init-org-directory-h ()
(unless org-directory (unless org-directory
(setq-default org-directory "~/org")) (setq-default org-directory "~/org"))
(setq org-id-locations-file (expand-file-name ".orgids" org-directory))) (unless org-id-locations-file
(setq org-id-locations-file (expand-file-name ".orgids" org-directory))))
(defun +org-init-agenda-h () (defun +org-init-agenda-h ()
@ -1047,6 +1048,7 @@ compelling reason, so..."
;; Set to nil so we can detect user changes to them later (and fall back on ;; Set to nil so we can detect user changes to them later (and fall back on
;; defaults otherwise). ;; defaults otherwise).
(defvar org-directory nil) (defvar org-directory nil)
(defvar org-id-locations-file nil)
(defvar org-attach-id-dir nil) (defvar org-attach-id-dir nil)
(setq org-publish-timestamp-directory (concat doom-cache-dir "org-timestamps/") (setq org-publish-timestamp-directory (concat doom-cache-dir "org-timestamps/")