From 46e17d403f86fe7c5dc06b1d52626c202aedd1d1 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Thu, 4 Jun 2020 20:03:43 -0400 Subject: [PATCH] Remove unneeded org-journal advice Due to bugfixes upstream. --- modules/lang/org/contrib/journal.el | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/modules/lang/org/contrib/journal.el b/modules/lang/org/contrib/journal.el index 9371e8c57..52d514175 100644 --- a/modules/lang/org/contrib/journal.el +++ b/modules/lang/org/contrib/journal.el @@ -13,23 +13,13 @@ (add-to-list 'magic-mode-alist '(+org-journal-p . org-journal-mode)) (defun +org-journal-p () - (when buffer-file-name + (when-let (buffer-file-name (buffer-file-name (buffer-base-buffer))) (and (file-in-directory-p buffer-file-name (expand-file-name org-journal-dir org-directory)) (delq! '+org-journal-p magic-mode-alist 'assq) (require 'org-journal nil t) (org-journal-is-journal)))) - ;; HACK `org-journal-is-journal' doesn't anticipate symlinks, and won't - ;; correctly detect journal files in an unresolved `org-directory' or - ;; `org-journal'. `org-journal-dir' must be given the `file-truename' - ;; treatment later, as well. - (defadvice! +org--journal-resolve-symlinks-a (orig-fn) - :around #'org-journal-is-journal - (when buffer-file-name - (let ((buffer-file-name (file-truename buffer-file-name))) - (funcall orig-fn)))) - ;; `org-journal-dir' defaults to "~/Documents/journal/", which is an odd ;; default, so we change it to {org-directory}/journal (we expand it after ;; org-journal is loaded). @@ -38,7 +28,7 @@ :config ;; `org-journal' can't deal with symlinks, so resolve them here. - (setq org-journal-dir (file-truename (expand-file-name org-journal-dir org-directory)) + (setq org-journal-dir (expand-file-name org-journal-dir org-directory) ;; Doom opts for an "open in a popup or here" strategy as a default. ;; Open in "other window" is less predictable, and can replace a window ;; we wanted to keep visible.