emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove unneeded org-journal advice

Browse source 
Due to bugfixes upstream.
This commit is contained in:
Henrik Lissner 2020-06-04 20:03:43 -04:00
parent 8bf902d5f4
commit 46e17d403f
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 2 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

14
modules/lang/org/contrib/journal.el
View file

@ -13,23 +13,13 @@
(add-to-list 'magic-mode-alist '(+org-journal-p . org-journal-mode)) (add-to-list 'magic-mode-alist '(+org-journal-p . org-journal-mode))
(defun +org-journal-p () (defun +org-journal-p ()
(when buffer-file-name (when-let (buffer-file-name (buffer-file-name (buffer-base-buffer)))
(and (file-in-directory-p (and (file-in-directory-p
buffer-file-name (expand-file-name org-journal-dir org-directory)) buffer-file-name (expand-file-name org-journal-dir org-directory))
(delq! '+org-journal-p magic-mode-alist 'assq) (delq! '+org-journal-p magic-mode-alist 'assq)
(require 'org-journal nil t) (require 'org-journal nil t)
(org-journal-is-journal)))) (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 ;; `org-journal-dir' defaults to "~/Documents/journal/", which is an odd
;; default, so we change it to {org-directory}/journal (we expand it after ;; default, so we change it to {org-directory}/journal (we expand it after
;; org-journal is loaded). ;; org-journal is loaded).
@ -38,7 +28,7 @@
:config :config
;; `org-journal' can't deal with symlinks, so resolve them here. ;; `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. ;; 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 ;; Open in "other window" is less predictable, and can replace a window
;; we wanted to keep visible. ;; we wanted to keep visible.