From 16b243733b8fca4efc5c79db854321a412f91e1a Mon Sep 17 00:00:00 2001
From: Tim Ruffing <crypto@timruffing.de>
Date: Tue, 9 Jul 2024 14:46:48 +0200
Subject: [PATCH] fix(org): restart org in all optimized buffers

Fix: #7737
---
 modules/lang/org/config.el | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/modules/lang/org/config.el b/modules/lang/org/config.el
index beded477b..1571110c1 100644
--- a/modules/lang/org/config.el
+++ b/modules/lang/org/config.el
@@ -775,19 +775,7 @@ mutating hooks on exported output, like formatters."
         (let (persp-autokill-buffer-on-remove)
           (persp-remove-buffer org-agenda-new-buffers
                                (get-current-persp)
-                               nil))))
-    (defun +org-defer-mode-in-agenda-buffers-h ()
-      "`org-agenda' opens temporary, incomplete org-mode buffers.
-I've disabled a lot of org-mode's startup processes for these invisible buffers
-to speed them up (in `+org--exclude-agenda-buffers-from-recentf-a'). However, if
-the user tries to visit one of these buffers they'll see a gimped, half-broken
-org buffer. To avoid that, restart `org-mode' when they're switched to so they
-can grow up to be fully-fledged org-mode buffers."
-      (dolist (buffer org-agenda-new-buffers)
-        (when (buffer-live-p buffer)      ; Ensure buffer is not killed
-          (with-current-buffer buffer
-            (add-hook 'doom-switch-buffer-hook #'+org--restart-mode-h
-                      nil 'local))))))
+                               nil)))))
 
   (defadvice! +org--restart-mode-before-indirect-buffer-a (&optional buffer _)
     "Restart `org-mode' in buffers in which the mode has been deferred (see
@@ -802,7 +790,14 @@ buffer as done, e.g., by `org-capture'."
 
   (defvar recentf-exclude)
   (defadvice! +org--optimize-backgrounded-agenda-buffers-a (fn file)
-    "Prevent temporarily opened agenda buffers from polluting recentf."
+    "Disable a lot of org-mode's startup processes for temporary agenda buffers.
+
+    This includes preventing them from polluting recentf.
+
+    However, if the user tries to visit one of these buffers they'll see a
+    gimped, half-broken org buffer. To avoid that, install a hook to restart
+    `org-mode' when they're switched to so they can grow up to be fully-fledged
+    org-mode buffers."
     :around #'org-get-agenda-file-buffer
     (let ((recentf-exclude (list (lambda (_file) t)))
           (doom-inhibit-large-file-detection t)
@@ -811,7 +806,12 @@ buffer as done, e.g., by `org-capture'."
           vc-handled-backends
           org-mode-hook
           find-file-hook)
-      (funcall fn file)))
+      (let ((buf (funcall fn file)))
+        (if buf
+         (with-current-buffer buf
+            (add-hook 'doom-switch-buffer-hook #'+org--restart-mode-h
+                      nil 'local)))
+       buf)))
 
   (defadvice! +org--fix-inconsistent-uuidgen-case-a (uuid)
     "Ensure uuidgen is always lowercase (consistent) regardless of system."