jao-pdf: circular require fix

8 files changed, 42 insertions, 61 deletions

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)
diff --git a/init.el b/init.el
index e54e43f..bbd4e0c 100644
--- a/init.el
+++ b/init.el
@@ -954,22 +954,6 @@
   (jao-define-attached-buffer "^\\*xref\\*"))
 
 ;;;; same mode
-(defun jao-buffer-same-mode (&optional mode pre-fn switch-fn)
-  (interactive)
-  (let* ((mode (or mode major-mode))
-         (modes (if (symbolp mode) (list mode) mode))
-         (pred `(lambda (b)
-                  (let ((b (get-buffer (if (consp b) (car b) b))))
-                    (member (buffer-local-value 'major-mode b)
-                            ',modes))))
-         (buff (read-buffer "Buffer: " nil t pred)))
-    (when pre-fn (funcall pre-fn))
-    (if switch-fn (funcall switch-fn buff) (switch-to-buffer buff))))
-
-(defun jao-buffer-same-mode-cmd (&optional pop)
-  (interactive "P")
-  (jao-buffer-same-mode nil nil (and pop #'pop-to-buffer)))
-
 (global-set-key (kbd "C-c C-b") #'jao-buffer-same-mode-cmd)
 
 ;;;; projects
@@ -2064,6 +2048,11 @@
   (interactive)
   (sieve-manage "imap.mailbox.org"))
 
+(defun jao-select-pdf ()
+  (interactive)
+  (jao-buffer-same-mode '(pdf-view-mode doc-view-mode org-mode)
+                        #'jao-afio-goto-docs))
+
 (jao-d-l
  (progn
    (defun jao-open-firefox () (interactive) (jao-mac-open "-a Firefox"))
@@ -2099,12 +2088,6 @@
        ("o" "open doc" jao-open-doc)
        ("c" "view cache" doc-view-dired-cache)
        ("s" "spotlight" jao-transient-spotlight)]
-      ;; ["External"
-      ;;  ("xn" "browse NNW article" jao-nnw-browse-current-article)
-      ;;  ("xs" "browse safary article" jao-safari-internal-browse)
-      ;;  ("xk" "open skim doc" jao-open-skim-doc-in-emacs)
-      ;;  ("xe" "choose an emoji" ns-do-show-character-palette
-      ;;   :if display-graphic-p)]
       ["Blog"
        ("bn" "create post" jao-org-static-blog-create-new-post)
        ("bd" "create draft" jao-org-static-blog-create-new-draft)
diff --git a/lib/doc/jao-pdf.el b/lib/doc/jao-pdf.el
index 0a1734f..1b4d9ac 100644
--- a/lib/doc/jao-pdf.el
+++ b/lib/doc/jao-pdf.el
@@ -27,7 +27,6 @@
 ;;   - Interoperability with zathura.
 
 (require 'jao-doc-session)
-(require 'jao-afio)
 (require 'browse-url)
 
 ;;; PDF info
@@ -127,11 +126,6 @@
                                         (concat jao-pdf-org-dir "/doc/")))))
     (funcall jao-open-doc-fun file page height)))
 
-(defun jao-select-pdf ()
-  (interactive)
-  (jao-buffer-same-mode '(pdf-view-mode doc-view-mode org-mode)
-                        #'jao-afio-goto-docs))
-
 ;;; doc:// links for browse-url
 
 (defun jao-open-doc-url (url &rest _)
diff --git a/lib/eos/jao-afio.el b/lib/eos/jao-afio.el
index caacc8c..1400949 100644
--- a/lib/eos/jao-afio.el
+++ b/lib/eos/jao-afio.el
@@ -22,6 +22,7 @@
 (require 'multisession)
 (require 'cl-lib)
 (require 'jao-doc-session)
+(require 'jao-pdf)
 
 (defvar jao-afio-use-frames (not window-system))
 (defvar jao-afio-frame-parameters nil)
@@ -144,6 +145,16 @@
     (jao-eww-session-load)))
 
 ;;;###autoload
+(defun jao-afio-org-agenda ()
+  (interactive)
+  (org-agenda nil "j")
+  (when-let* ((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))))
+
+;;;###autoload
 (defun jao-afio-open-www ()
   (interactive)
   (require 'jao-eww-session)
@@ -165,7 +176,7 @@
 ;;;###autoload
 (defun jao-afio-open-gnus ()
   (interactive)
-  ;; (jao-org-agenda)
+  (jao-afio-org-agenda)
   (calendar)
   (find-file (expand-file-name "inbox.org" org-directory))
   (delete-other-windows)
@@ -180,7 +191,7 @@
   (set-window-dedicated-p nil t)
   (split-window-below (/ (window-height) 3))
   (other-window 1)
-  (jao-org-agenda)
+  (jao-afio-org-agenda)
   (set-window-dedicated-p nil t)
   (split-window-below -8)
   (other-window 1)
diff --git a/lib/eos/jao-buffers.el b/lib/eos/jao-buffers.el
index 5a41486..cae6c0f 100644
--- a/lib/eos/jao-buffers.el
+++ b/lib/eos/jao-buffers.el
@@ -51,7 +51,23 @@
   (add-to-list 'display-buffer-alist
                (jao-attached-buffer-entry name-rx height)))
 
+;;;###autoload
+(defun jao-buffer-same-mode (&optional mode pre-fn switch-fn)
+  (interactive)
+  (let* ((mode (or mode major-mode))
+         (modes (if (symbolp mode) (list mode) mode))
+         (pred `(lambda (b)
+                  (let ((b (get-buffer (if (consp b) (car b) b))))
+                    (member (buffer-local-value 'major-mode b)
+                            ',modes))))
+         (buff (read-buffer "Buffer: " nil t pred)))
+    (when pre-fn (funcall pre-fn))
+    (if switch-fn (funcall switch-fn buff) (switch-to-buffer buff))))
 
+;;;###autoload
+(defun jao-buffer-same-mode-cmd (&optional pop)
+  (interactive "P")
+  (jao-buffer-same-mode nil nil (and pop #'pop-to-buffer)))
 
 (provide 'jao-buffers)
 ;;; jao-buffers.el ends here