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

Polish org +journal submodule

Browse source 
Fix journal files not opening in org-journal-mode.
This commit is contained in:
Henrik Lissner 2020-01-18 20:34:37 -05:00
parent bee7798a50
commit 8c96e3f78c
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 33 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,16 +1,41 @@
;;; lang/org/contrib/journal.el -*- lexical-binding: t; -*- ;;; lang/org/contrib/journal.el -*- lexical-binding: t; -*-
;;;###if (featurep! +journal) ;;;###if (featurep! +journal)
;; HACK org-journal does some file-path magic at load time that creates
;; duplicate `auto-mode-alist' entries, so we suppress it for now, so we
;; can do it properly later.
(advice-add #'org-journal-update-auto-mode-alist :override #'ignore)
(after! org-journal (after! org-journal
(setq org-journal-dir (expand-file-name "journal/" org-directory) (setq org-journal-dir (expand-file-name "journal/" org-directory)
org-journal-file-pattern org-journal-cache-file (concat doom-cache-dir "org-journal")
(expand-file-name "\\(?1:[0-9]\\{4\\}\\)\\(?2:[0-9][0-9]\\)\\(?3:[0-9][0-9]\\)\\'" org-journal-file-pattern (org-journal-dir-and-format->regex
org-journal-dir)) org-journal-dir org-journal-file-format))
(map! :localleader (add-to-list 'auto-mode-alist (cons org-journal-file-pattern 'org-journal-mode))
(map! (:map org-journal-mode-map
:n "]f" #'org-journal-open-next-entry
:n "[f" #'org-journal-open-previous-entry
:n "C-n" #'org-journal-open-next-entry
:n "C-p" #'org-journal-open-previous-entry)
(:map org-journal-search-mode-map
"C-n" #'org-journal-search-next
"C-p" #'org-journal-search-previous)
:localleader
(:map org-journal-mode-map
"c" #'org-journal-new-entry
"d" #'org-journal-new-date-entry
"n" #'org-journal-open-next-entry
"p" #'org-journal-open-previous-entry
(:prefix "s"
"s" #'org-journal-search
"f" #'org-journal-search-forever
"F" #'org-journal-search-future
"w" #'org-journal-search-calendar-week
"m" #'org-journal-search-calendar-month
"y" #'org-journal-search-calendar-year))
(:map org-journal-search-mode-map (:map org-journal-search-mode-map
"n" #'org-journal-search-next "n" #'org-journal-search-next
"p" #'org-journal-search-prev) "p" #'org-journal-search-prev)))
(:map org-journal-mode-map
"n" #'org-journal-open-next-entry
"p" #'org-journal-open-previous-entry)))