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

Bump :lang org

Browse source 
bastibe/org-journal@6671693 -> bastibe/org-journal@24b5879
emacs-straight/org-mode@945f495 -> emacs-straight/org-mode@b76ed65
kaushalmodi/ox-hugo@e8c14e2 -> kaushalmodi/ox-hugo@77050d2
magit/orgit@e147f05 -> magit/orgit@9f09553
org-roam/org-roam@fd73da9 -> org-roam/org-roam@c59d6c4

Closes #3453
This commit is contained in:
Henrik Lissner 2020-06-24 18:33:05 -04:00
parent fe7ffd759d
commit 28a3d8b908
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
2 changed files with 15 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -9,16 +9,16 @@
;; delay on the first file the user opens, because calling the autoloaded ;; delay on the first file the user opens, because calling the autoloaded
;; `org-journal-is-journal' pulls all of `org' with it. So, we replace it ;; `org-journal-is-journal' pulls all of `org' with it. So, we replace it
;; with our own, extra layer of heuristics. ;; with our own, extra layer of heuristics.
(setq magic-mode-alist (assq-delete-all 'org-journal-is-journal magic-mode-alist))
(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-let (buffer-file-name (buffer-file-name (buffer-base-buffer))) (when-let (buffer-file-name (buffer-file-name (buffer-base-buffer)))
(and (file-in-directory-p (if (or (featurep 'org-journal)
buffer-file-name (expand-file-name org-journal-dir org-directory)) (and (file-in-directory-p
(delq! '+org-journal-p magic-mode-alist 'assq) buffer-file-name (expand-file-name org-journal-dir org-directory))
(require 'org-journal nil t) (delq! '+org-journal-p magic-mode-alist 'assq)
(org-journal-is-journal)))) (require 'org-journal nil t)))
(org-journal-is-journal))))
;; `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
@ -27,6 +27,10 @@
org-journal-cache-file (concat doom-cache-dir "org-journal")) org-journal-cache-file (concat doom-cache-dir "org-journal"))
:config :config
;; Remove the orginal journal file detector and rely on `+org-journal-p'
;; instead, to avoid loading org-journal until the last possible moment.
(setq magic-mode-alist (assq-delete-all 'org-journal-is-journal magic-mode-alist))
;; `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 (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.

10
modules/lang/org/packages.el
View file

@ -27,7 +27,7 @@
:recipe (:host github :recipe (:host github
:repo "emacs-straight/org-mode" :repo "emacs-straight/org-mode"
:files ("*.el" "lisp/*.el" "contrib/lisp/*.el")) :files ("*.el" "lisp/*.el" "contrib/lisp/*.el"))
:pin "945f495b942f60c3b15a38202847e49aaff757d5") :pin "b76ed658f1d99e5f5781324d2115d35ed879fef1")
;; ...And prevent other packages from pulling org; org-plus-contrib satisfies ;; ...And prevent other packages from pulling org; org-plus-contrib satisfies
;; the dependency already: https://github.com/raxod502/straight.el/issues/352 ;; the dependency already: https://github.com/raxod502/straight.el/issues/352
(package! org :recipe (:local-repo nil)) (package! org :recipe (:local-repo nil))
@ -49,7 +49,7 @@
(when (featurep! :tools pdf) (when (featurep! :tools pdf)
(package! org-pdftools :pin "8cc15bb8014ed1f047eecc0abd8bf447f86c0505")) (package! org-pdftools :pin "8cc15bb8014ed1f047eecc0abd8bf447f86c0505"))
(when (featurep! :tools magit) (when (featurep! :tools magit)
(package! orgit :pin "e147f055772cc934fe1f1d8619059badeb647c93")) (package! orgit :pin "9f09553c09e389f7e695afb8dd1aa5a52f18f107"))
(when (featurep! +brain) (when (featurep! +brain)
(package! org-brain :pin "6b2ec93ec92b4a244af9d600433e0d0a02eb5f1e")) (package! org-brain :pin "6b2ec93ec92b4a244af9d600433e0d0a02eb5f1e"))
(when (featurep! +dragndrop) (when (featurep! +dragndrop)
@ -62,7 +62,7 @@
(when (featurep! +jupyter) (when (featurep! +jupyter)
(package! jupyter :pin "785edbbff65abb0c929dc2fbd8b8305c77fd529e")) (package! jupyter :pin "785edbbff65abb0c929dc2fbd8b8305c77fd529e"))
(when (featurep! +journal) (when (featurep! +journal)
(package! org-journal :pin "6671693a6f70cf9ce23471785e3c73b9489762bb")) (package! org-journal :pin "24b587978241328fcad40f932602a0a4c1e7d403"))
(when (featurep! +noter) (when (featurep! +noter)
(package! org-noter :pin "9ead81d42dd4dd5074782d239b2efddf9b8b7b3d")) (package! org-noter :pin "9ead81d42dd4dd5074782d239b2efddf9b8b7b3d"))
(when (featurep! +pomodoro) (when (featurep! +pomodoro)
@ -74,7 +74,7 @@
(package! org-tree-slide :pin "7126a4365072a32898f169ead8fb59265dabc605") (package! org-tree-slide :pin "7126a4365072a32898f169ead8fb59265dabc605")
(package! org-re-reveal :pin "a9e9d4ef88417b3af7741a8d8f444ece820e7a3b")) (package! org-re-reveal :pin "a9e9d4ef88417b3af7741a8d8f444ece820e7a3b"))
(when (featurep! +roam) (when (featurep! +roam)
(package! org-roam :pin "fd73da94107dd3069379a9564be9ccf5712db084") (package! org-roam :pin "c59d6c4f7c917cf8580df2797f331c53e404fdbe")
(when (featurep! :completion company) (when (featurep! :completion company)
(package! company-org-roam :pin "674c2bd493f571c5323d69279557a6c18ccbd14e"))) (package! company-org-roam :pin "674c2bd493f571c5323d69279557a6c18ccbd14e")))
@ -103,6 +103,6 @@
(when (featurep! +hugo) (when (featurep! +hugo)
(package! ox-hugo (package! ox-hugo
:recipe (:host github :repo "kaushalmodi/ox-hugo" :nonrecursive t) :recipe (:host github :repo "kaushalmodi/ox-hugo" :nonrecursive t)
:pin "e8c14e2b73a882289db8143ea5f43b1ecf7df0b0")) :pin "77050d256fc2cb58483284bc56617e25596e445b"))
(when (featurep! :lang rst) (when (featurep! :lang rst)
(package! ox-rst :pin "9158bfd18096c559e0a225ae62ab683f1c98a547")) (package! ox-rst :pin "9158bfd18096c559e0a225ae62ab683f1c98a547"))