From 4788dd60fe696b36c05f3ed2f206e3dfd5a09761 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <git@henrik.io>
Date: Fri, 28 Jun 2024 18:35:36 -0400
Subject: [PATCH 1/4] fix(org): serve evil-org-mode from @doomelpa

Instead of relying on Github's implicit redirect.

Fix: #7875
---
 modules/lang/org/packages.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/lang/org/packages.el b/modules/lang/org/packages.el
index 03d39e3ef..02d9620d6 100644
--- a/modules/lang/org/packages.el
+++ b/modules/lang/org/packages.el
@@ -66,7 +66,7 @@
 
 (when (modulep! :editor evil +everywhere)
   (package! evil-org
-    :recipe (:host github :repo "hlissner/evil-org-mode")
+    :recipe (:host github :repo "doomelpa/evil-org-mode")
     :pin "a9706da260c45b98601bcd72b1d2c0a24a017700"))
 (when (modulep! :tools pdf)
   (package! org-pdftools :pin "4e420233a153a9c4ab3d1a7e1d7d3211c836f0ac"))

From 36a1cda72432cf07319f0314b62d5bcc46f65ee5 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <git@henrik.io>
Date: Fri, 28 Jun 2024 18:41:42 -0400
Subject: [PATCH 2/4] fix(org): revise org-crypt init

The `org-decrypt-entry` hook is redundant with a hook org-crypt already
adds to `org-fold-reveal-start-hook` at load time.

Fix: #7835
Fix: #6250
---
 modules/lang/org/config.el | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/modules/lang/org/config.el b/modules/lang/org/config.el
index fb297e1c4..8bc5fc535 100644
--- a/modules/lang/org/config.el
+++ b/modules/lang/org/config.el
@@ -1153,15 +1153,12 @@ between the two."
 (use-package! org-crypt ; built-in
   :when (modulep! +crypt)
   :commands org-encrypt-entries org-encrypt-entry org-decrypt-entries org-decrypt-entry
-  :hook (org-reveal-start . org-decrypt-entry)
+  :hook (org-load . org-crypt-use-before-save-magic)
   :preface
   ;; org-crypt falls back to CRYPTKEY property then `epa-file-encrypt-to', which
   ;; is a better default than the empty string `org-crypt-key' defaults to.
   (defvar org-crypt-key nil)
-  (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))))
+  (after! org (add-to-list 'org-tags-exclude-from-inheritance "crypt")))
 
 
 (use-package! org-clock ; built-in

From d9c5f747abc29991b55009534ee3244e869eb109 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <git@henrik.io>
Date: Fri, 28 Jun 2024 19:11:28 -0400
Subject: [PATCH 3/4] tweak(org): org-effort-property = EFFORT

---
 modules/lang/org/config.el | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/lang/org/config.el b/modules/lang/org/config.el
index 8bc5fc535..a17228d85 100644
--- a/modules/lang/org/config.el
+++ b/modules/lang/org/config.el
@@ -1459,6 +1459,9 @@ between the two."
   (setq org-num-face '(:inherit org-special-keyword :underline nil :weight bold)
         org-num-skip-tags '("noexport" "nonum"))
 
+  ;; Other org properties are all-caps. Be consistent.
+  (setq org-effort-property "EFFORT")
+
   ;; Prevent modifications made in invisible sections of an org document, as
   ;; unintended changes can easily go unseen otherwise.
   (setq org-catch-invisible-edits 'smart)

From d3d50474888195ab43db03c7607f356424b09d18 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <git@henrik.io>
Date: Fri, 28 Jun 2024 23:07:57 -0400
Subject: [PATCH 4/4] fix(lsp): revert refactor of map! call

This change (made in ae9e1fea) was a tad too hasty, since
general.el (under the hood) implicitly deferred the keybinding until
eglot-mode-map, which define-key does not do.

Fix: #7911
Amend: ae9e1feaa6b8
---
 modules/tools/lsp/+eglot.el | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/modules/tools/lsp/+eglot.el b/modules/tools/lsp/+eglot.el
index a163bfc5a..c99da683a 100644
--- a/modules/tools/lsp/+eglot.el
+++ b/modules/tools/lsp/+eglot.el
@@ -62,9 +62,12 @@ server an expensive restart when its buffer is reverted."
 
 
 (use-package! consult-eglot
-  :defer t
   :when (modulep! :completion vertico)
-  :init (define-key eglot-mode-map [remap xref-find-apropos] #'consult-eglot-symbols))
+  :defer t
+  :init
+  (map! :after eglot
+        :map eglot-mode-map
+        [remap xref-find-apropos] #'consult-eglot-symbols))
 
 
 (use-package! flycheck-eglot