From 2c6afef1f6bb75097bd192ccb8a88489da4eb063 Mon Sep 17 00:00:00 2001
From: jao <jao@gnu.org>
Date: Fri, 2 Sep 2022 02:37:20 +0100
Subject: afio frame toggling and clean-ups

---
 custom/jao-custom-completion.el |  2 +-
 custom/jao-custom-email.el      |  2 +-
 custom/jao-custom-eww.el        |  6 +++---
 custom/jao-custom-exwm.el       | 16 ++++++++--------
 custom/jao-custom-org.el        |  2 +-
 custom/jao-custom-w3m.el        |  4 ++--
 6 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'custom')

diff --git a/custom/jao-custom-completion.el b/custom/jao-custom-completion.el
index 0682b44..3977167 100644
--- a/custom/jao-custom-completion.el
+++ b/custom/jao-custom-completion.el
@@ -427,7 +427,7 @@
 (defun jao-embark-targets--play-video (player url)
   (interactive "sURL: ")
   (let ((cmd (format "%s %s" player (shell-quote-argument url))))
-    (jao-afio--goto-www)
+    (jao-afio-goto-www)
     (start-process-shell-command player nil cmd)))
 
 (defun jao-embark-targets-mpv (&optional url)
diff --git a/custom/jao-custom-email.el b/custom/jao-custom-email.el
index f35925b..83707ee 100644
--- a/custom/jao-custom-email.el
+++ b/custom/jao-custom-email.el
@@ -293,7 +293,7 @@
         :history 'jao-mail-consult-buffer-history
         :action (lambda (b)
                   (when (not (string-blank-p (or b "")))
-                    (jao-afio--goto-mail)
+                    (jao-afio-goto-mail)
                     (if (get-buffer-window b)
                         (pop-to-buffer b)
                       (pop-to-buffer-same-window b))))
diff --git a/custom/jao-custom-eww.el b/custom/jao-custom-eww.el
index dbe147f..ae486fb 100644
--- a/custom/jao-custom-eww.el
+++ b/custom/jao-custom-eww.el
@@ -5,7 +5,7 @@
   "Browse URL using eww."
   (if (derived-mode-p 'eww-mode)
       (eww url)
-    (jao-afio--goto-www)
+    (jao-afio-goto-www)
     (select-window (frame-first-window))
     (let* ((url (url-encode-url url))
            (bf (seq-find `(lambda (b)
@@ -66,7 +66,7 @@
           :annotate (lambda (c) (get-text-property 0 'url c))
           :history 'jao-eww-consult-history
           :action (lambda (b)
-                    (jao-afio--goto-www)
+                    (jao-afio-goto-www)
                     (switch-to-buffer (get-text-property 0 'buffer b)))
           :items
           (lambda ()
@@ -100,7 +100,7 @@
   (interactive "P")
   (if (> (length jao-eww--closed-urls) 0)
       (let ((url (completing-read "URL: " jao-eww--closed-urls)))
-        (jao-afio--goto-www)
+        (jao-afio-goto-www)
         (setq jao-eww--closed-urls (remove url jao-eww--closed-urls))
         (eww url (when arg 4)))
     (message "No previously closed URLs.")))
diff --git a/custom/jao-custom-exwm.el b/custom/jao-custom-exwm.el
index 842fd1a..d40b297 100644
--- a/custom/jao-custom-exwm.el
+++ b/custom/jao-custom-exwm.el
@@ -238,7 +238,7 @@
             (defun ,toggler (,arg)
               (interactive "P")
               (if (and (not ,arg) (equal exwm-class-name ,class))
-                  (jao-afio--goto-main)
+                  (jao-afio-goto-main)
                 (,name))))))
 
 (defun jao-exwm--send-str (str)
@@ -309,7 +309,7 @@
                                          (car (jao-zathura--file-info b))))
                            (jao-zathura--buffers)))
          (page-no (or page-no (jao-doc-view-current-page))))
-    (if jao-exwm--use-afio (jao-afio--goto-docs) (jao-exwm--goto-docs))
+    (if jao-exwm--use-afio (jao-afio-goto-docs) (jao-exwm--goto-docs))
     (if (not buffer)
         (jao-exwm-run (if page-no
                           (format "zathura -P %s '%s'" page-no file-name)
@@ -395,7 +395,7 @@
                             (or (jao-zathura--buffer-p b)
                                 (member (buffer-local-value 'major-mode b)
                                         '(pdf-view-mode doc-view-mode))))))))
-    (jao-afio--goto-docs)
+    (jao-afio-goto-docs)
     (pop-to-buffer b)))
 
 
@@ -482,11 +482,11 @@
 
 (setq
  exwm-input-global-keys
- '(([?\s-0] . jao-afio--goto-scratch)
-   ([?\s-1] . jao-afio--goto-main)
-   ([?\s-2] . jao-afio--goto-mail)
-   ([?\s-3] . jao-afio--goto-www)
-   ([?\s-4] . jao-afio--goto-docs)
+ '(([?\s-0] . jao-afio-goto-scratch)
+   ([?\s-1] . jao-afio-goto-main)
+   ([?\s-2] . jao-afio-goto-mail)
+   ([?\s-3] . jao-afio-goto-www)
+   ([?\s-4] . jao-afio-goto-docs)
    ([?\s-A] . org-agenda-list)
    ([?\s-a] . jao-first-window)
    ([?\s-b] . jao-transient-org-blog)
diff --git a/custom/jao-custom-org.el b/custom/jao-custom-org.el
index f46b9ee..b98f665 100644
--- a/custom/jao-custom-org.el
+++ b/custom/jao-custom-org.el
@@ -5,7 +5,7 @@
   :ensure t
   :custom ((org-export-backends '(ascii html latex texinfo)))
   :init
-  (defalias 'jao-open-gnus-frame 'jao-afio--goto-mail)
+  (defalias 'jao-open-gnus-frame 'jao-afio-goto-mail)
 
   (setq org-adapt-indentation t
         org-catch-invisible-edits 'smart
diff --git a/custom/jao-custom-w3m.el b/custom/jao-custom-w3m.el
index 0ccd37c..0edac5e 100644
--- a/custom/jao-custom-w3m.el
+++ b/custom/jao-custom-w3m.el
@@ -10,7 +10,7 @@
       (pop-to-buffer b))))
 
 (defun jao-w3m-browse-url (url &rest r)
-  (jao-afio--goto-www)
+  (jao-afio-goto-www)
   (select-window (frame-first-window))
   (unless (jao-w3m-find-url url)
     (w3m-goto-url-new-session url)))
@@ -122,7 +122,7 @@
                      (seq-map #'jao-www--item
                               (seq-filter #'jao-www--buffer-p (buffer-list))))
             :action (lambda (b)
-                      (jao-afio--goto-www)
+                      (jao-afio-goto-www)
                       (switch-to-buffer (get-text-property 0 'buffer b)))))
     (jao-consult-add-buffer-source 'jao-consult-w3m-source "Web" ?w)))
 
-- 
cgit v1.2.3