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

Bump :lang org

Browse source 
bastibe/org-journal@8bf06b2 -> bastibe/org-journal@2c43b10
emacs-straight/org-mode@20c1322 -> emacs-straight/org-mode@93c50e3
oer/org-re-reveal@61549f4 -> oer/org-re-reveal@a9e9d4e
org-roam/company-org-roam@3da3821 -> org-roam/company-org-roam@674c2bd
org-roam/org-roam@ad5fca5 -> org-roam/org-roam@1267a43

Fixes #3123
This commit is contained in:
Henrik Lissner 2020-05-16 05:13:46 -04:00
parent 10d9ca87e9
commit e3ca1d52ad
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
2 changed files with 6 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

14
modules/lang/org/config.el
View file

@ -831,19 +831,7 @@ compelling reason, so..."
(after! org
(add-to-list 'org-tags-exclude-from-inheritance "crypt")
(add-hook! 'org-mode-hook
(add-hook 'before-save-hook 'org-encrypt-entries nil t)))
:config
(after! epa
;; HACK Fix #3123: `org-encrypt-string' expects `epa-file-encrypt-to' to be
;; a string, but its docs say it can be a string or list of strings,
;; and Doom sets it to a list of strings by default. Remove this when
;; this is addressed upstream.
;; TODO Report this upstream.
(unless org-crypt-key
(setq org-crypt-key
(if (listp epa-file-encrypt-to)
(car epa-file-encrypt-to)
epa-file-encrypt-to)))))
(add-hook 'before-save-hook 'org-encrypt-entries nil t))))
(use-package! org-clock ; built-in

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

@ -27,7 +27,7 @@
:recipe (:host github
:repo "emacs-straight/org-mode"
:files ("*.el" "lisp/*.el" "contrib/lisp/*.el"))
:pin "20c13221942183290dc440ca6ba91597f243b9e7")
:pin "93c50e3a7867a1a85fc78b337172585f7a10dcc6")
;; ...And prevent other packages from pulling org; org-plus-contrib satisfies
;; the dependency already: https://github.com/raxod502/straight.el/issues/352
(package! org :recipe (:local-repo nil))
@ -62,7 +62,7 @@
(when (featurep! +jupyter)
(package! jupyter :pin "785edbbff65abb0c929dc2fbd8b8305c77fd529e"))
(when (featurep! +journal)
(package! org-journal :pin "8bf06b28d6f14f52d4968123e2b4b91930c8f947"))
(package! org-journal :pin "2c43b10eed0659f8e47797e5e53d2973f939284d"))
(when (featurep! +noter)
(package! org-noter :pin "9ead81d42dd4dd5074782d239b2efddf9b8b7b3d"))
(when (featurep! +pomodoro)
@ -72,11 +72,11 @@
:recipe (:host github :repo "anler/centered-window-mode")
:pin "f50859941ab5c7cbeaee410f2d38716252b552ac")
(package! org-tree-slide :pin "7bf09a02bd2d8f1ccfcb5209bfb18fbe02d1f44e")
(package! org-re-reveal :pin "61549f4c00284a30e34caa3d76001b233ea5d2ad"))
(package! org-re-reveal :pin "a9e9d4ef88417b3af7741a8d8f444ece820e7a3b"))
(when (featurep! +roam)
(package! org-roam :pin "ad5fca5440e5c8a6b8078013684df43b3e43d773")
(package! org-roam :pin "1267a430431f11035798cc4007c5dd3efe543ced")
(when (featurep! :completion company)
(package! company-org-roam :pin "3da3821d1736e0d05a042bd944b74ea1da4a021b")))
(package! company-org-roam :pin "674c2bd493f571c5323d69279557a6c18ccbd14e")))
;;; Babel
(package! ob-async :pin "80a30b96a007d419ece12c976a81804ede340311")