From 5a0912802c8c6d76762c42558c511fcbff17e422 Mon Sep 17 00:00:00 2001
From: jao <jao@gnu.org>
Date: Mon, 7 Sep 2026 21:34:28 +0100
Subject: jao-pdf: circular require fix

---
 custom/jao-custom-exwm.el    |  2 +-
 custom/jao-custom-gnus.el    |  4 ++--
 custom/jao-custom-notmuch.el |  2 +-
 custom/jao-custom-org.el     | 31 ++++---------------------------
 4 files changed, 8 insertions(+), 31 deletions(-)

(limited to 'custom')

diff --git a/custom/jao-custom-exwm.el b/custom/jao-custom-exwm.el
index 3494044..404b3cd 100644
--- a/custom/jao-custom-exwm.el
+++ b/custom/jao-custom-exwm.el
@@ -497,7 +497,7 @@
    ([?\s-3] . jao-afio-goto-www)
    ([?\s-4] . jao-afio-goto-docs)
    ([?\s-5] . jao-afio-goto-chats)
-   ([?\s-A] . jao-org-agenda)
+   ([?\s-A] . jao-afio-org-agenda)
    ([?\s-a] . jao-first-window)
    ([?\s-b] . jao-transient-org-blog)
    ([?\s-d] . jao-exwm-tidal*)
diff --git a/custom/jao-custom-gnus.el b/custom/jao-custom-gnus.el
index 7e7172b..dddc209 100644
--- a/custom/jao-custom-gnus.el
+++ b/custom/jao-custom-gnus.el
@@ -717,7 +717,7 @@
   (defun jao-gnus--on-summary-exit ()
     (when (> (setq exit-count (+ 1 exit-count)) 20)
       (setq exit-count 0)
-      (jao-org-agenda))
+      (jao-afio-org-agenda))
     (jao-gnus--notify)))
 
 (add-hook 'gnus-summary-exit-hook #'jao-gnus--on-summary-exit)
@@ -766,7 +766,7 @@
 
 (defun jao-gnus-refresh-workspace ()
   (interactive)
-  (save-window-excursion (calendar) (jao-org-agenda)))
+  (save-window-excursion (calendar) (jao-afio-org-agenda)))
 
 ;;;; gnus-icalendar
 (require 'ol-gnus)
diff --git a/custom/jao-custom-notmuch.el b/custom/jao-custom-notmuch.el
index 06908e8..7315e7c 100644
--- a/custom/jao-custom-notmuch.el
+++ b/custom/jao-custom-notmuch.el
@@ -320,7 +320,7 @@
 ;;; hello
 (defun jao-notmuch-refresh-agenda ()
   (interactive)
-  (save-window-excursion (calendar) (jao-org-agenda)))
+  (save-window-excursion (calendar) (jao-afio-org-agenda)))
 
 (defun jao-notmuch-hello-first ()
   (interactive)
diff --git a/custom/jao-custom-org.el b/custom/jao-custom-org.el
index 582ade3..ef1fbbe 100644
--- a/custom/jao-custom-org.el
+++ b/custom/jao-custom-org.el
@@ -53,10 +53,10 @@
   :bind (:map org-mode-map ("<f3>" . org-shifttab)))
 
 ;;; Agenda
-(defun jao-org-agenda-fmt-date (date)
+(defun jao-afio-org-agenda-fmt-date (date)
   (org-agenda-format-date-aligned date))
 
-(defun jao-org-agenda-title ()
+(defun jao-afio-org-agenda-title ()
   (let ((fill-column (window-width)))
     (with-temp-buffer
       (insert " agenda ")
@@ -65,7 +65,7 @@
       (buffer-substring-no-properties (point-min) (point-max)))))
 
 (setq org-agenda-custom-commands
-      '(("j" agenda "" ((org-agenda-overriding-header #'jao-org-agenda-title)
+      '(("j" agenda "" ((org-agenda-overriding-header #'jao-afio-org-agenda-title)
                         (org-agenda-ndays-to-span 14)))
         ("w" todo "WAITING" nil)
         ("W" agenda "" ((org-agenda-ndays 21))))
@@ -75,7 +75,7 @@
       org-agenda-block-separator " "
       org-agenda-breadcrumbs-separator "•"
       org-agenda-current-time-string "•" ;; "*"
-      org-agenda-format-date #'jao-org-agenda-fmt-date
+      org-agenda-format-date #'jao-afio-org-agenda-fmt-date
       org-agenda-hide-tags-regexp ".*"
       org-agenda-include-diary t
       org-agenda-include-inactive-timestamps t
@@ -99,29 +99,6 @@
       ;;   (800 1000 1200 1400 1600 1800 2000) "" "·")
       org-agenda-window-setup 'current-window)
 
-(defun jao-org-agenda ()
-  (interactive)
-  (org-agenda nil "j")
-  (jao-org-agenda-hook))
-
-(defun jao-org-agenda-hook (&optional w)
-  (when-let* ((w (or w (get-buffer-window "*Org Agenda*"))))
-    (set-window-margins w 2 1)
-    (with-current-buffer (window-buffer w)
-      (setq-local cursor-in-non-selected-windows nil
-                  line-spacing 0.2))))
-
-;; (add-to-list 'display-buffer-alist
-;;              '((major-mode . org-agenda-mode)
-;;                (display-buffer-reuse-window)
-;;                (window-parameters (mode-line-format . none))
-;;                (body-function . jao-org-agenda-hook)))
-
-;; (add-to-list 'display-buffer-alist
-;;              '("inbox\\.org"
-;;                (display-buffer-reuse-window)
-;;                (window-parameters (mode-line-format . none))))
-
 ;;; Capture templates
 (jao-when-darwin
  (defun jao-org--safari-tmpl (&optional prefix)
-- 
cgit v1.2.3