email.org, with some notmuch fine-tuning

1 files changed, 10 insertions, 11 deletions

diff --git a/lib/eos/jao-afio.el b/lib/eos/jao-afio.el
index 1410b80..e6f1e72 100644
--- a/lib/eos/jao-afio.el
+++ b/lib/eos/jao-afio.el
@@ -20,6 +20,12 @@
 
 ;;; Code:
 
+(defvar jao-open-doc-fun 'find-file)
+(defvar jao-afio-mail-function 'gnus)
+(defvar jao-afio-use-w3m nil)
+(defvar jao-afio-notmuch-in-web t)
+(defvar jao-afio-switch-hook nil)
+
 (defvar jao-afio--configs '(?c ?w ?g ?p ?s))
 (defvar jao-afio--current-config (car jao-afio--configs))
 (defvar jao-afio--locker nil)
@@ -64,9 +70,6 @@
     (jao-afio--goto-frame next)))
 
 ;;;###autoload
-(defvar jao-open-doc-fun 'find-file)
-
-;;;###autoload
 (defun jao-afio-open-pdf-session ()
   (interactive)
   (dolist (doc (jao-doc-view-session))
@@ -86,10 +89,6 @@
       (when (and (jao-doc-view-session) (y-or-n-p "Load saved session? "))
         (jao-afio-open-pdf-session)))))
 
-(defvar jao-afio-mail-function 'gnus)
-(defvar jao-afio-use-w3m nil)
-(defvar jao-afio-notmuch-in-web t)
-
 (declare w3m "w3m")
 (declare w3m-alive-p "w3m")
 (declare w3m-previous-buffer "w3m")
@@ -128,9 +127,11 @@
   (interactive)
   (if (or (null jao-afio-mail-function) (eq 'gnus jao-afio-mail-function))
       (jao-afio-open-gnus)
-    (delete-other-windows)
+    (jao-trisect)
+    (other-window 2)
+    (delete-window)
+    (other-window 1)
     (funcall jao-afio-mail-function)
-    (jao-bisect)
     (other-window 1)
     (find-file (expand-file-name "inbox.org" org-directory))
     (split-window-below (/ (window-height) 3))
@@ -141,8 +142,6 @@
     (switch-to-buffer "*Calendar*")
     (other-window 1)))
 
-(defvar jao-afio-switch-hook nil)
-
 (defun jao-afio--goto-frame (next &optional reset)
   (when (or reset (not (eq next jao-afio--current-config)))
     (let ((next-cfg (when (not reset) (get-register next))))