little fixes for doc-view and pdfs

3 files changed, 11 insertions, 8 deletions

diff --git a/init.el b/init.el
index 2cebc20..e54e43f 100644
--- a/init.el
+++ b/init.el
@@ -181,7 +181,7 @@
 ;;;; process runners
 (use-package jao-shell
   :demand t
-  :bind (("s-r" . jao-shell-exec)))
+  :bind (("s-R" . jao-shell-exec)))
 
 ;;;; app launcher
 (jao-when-linux
@@ -918,7 +918,7 @@
       ("d" "on docs" jao-consult-spotlight-docs)
       ("m" "on messages" jao-consult-spotlight-mail)])
 
-   :bind (("s-e" . jao-transient-spotlight))))
+   :bind (("s-r" . jao-transient-spotlight))))
 
 ;;; Buffers
 ;;;; cursor and mark
diff --git a/lib/doc/jao-doc-view.el b/lib/doc/jao-doc-view.el
index bb89f03..74c4751 100644
--- a/lib/doc/jao-doc-view.el
+++ b/lib/doc/jao-doc-view.el
@@ -53,15 +53,15 @@
 (defvar-local jao-doc-view--trail-back ())
 (defvar-local jao-doc-view--trail-fwd ())
 
-(defun jao-doc-view--trail-push ()
+(defun jao-doc-view--trail-push (_dest-page)
   (when-let* ((page (jao-doc-view-current-page)))
     (unless (eq (car jao-doc-view--trail-back) page)
-      (push page jao-doc-view--trail-back))))
+      (cl-pushnew page jao-doc-view--trail-back))))
 
 (defun jao-doc-view-back ()
   (interactive nil doc-view-mode)
   (if-let* ((p (pop jao-doc-view--trail-back)))
-      (progn (push (jao-doc-view-current-page) jao-doc-view--trail-fwd)
+      (progn (cl-pushnew (jao-doc-view-current-page) jao-doc-view--trail-fwd)
              (jao-doc-view-goto-page p))
     (message "No more back marks.")))
 
diff --git a/lib/eos/jao-afio.el b/lib/eos/jao-afio.el
index 9e402a2..f6f07a3 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)
@@ -115,14 +116,16 @@
   (interactive)
   (dolist (doc (or docs (jao-doc-session)))
     (when (and (stringp doc) (file-exists-p doc))
-      (if (jao-pdf-is-pdf-file doc) (jao-open-doc doc) (find-file doc))
+      (if (jao-pdf-is-pdf-file doc) (funcall jao-open-doc-fun doc) (find-file doc))
       (other-window 1)))
   (other-window 1))
 
+(defvar jao-afio-left-width nil)
+
 (defun jao-afio-open-doc ()
   (interactive)
   (delete-other-windows)
-  (split-window-right 80)
+  (split-window-right jao-afio-left-width)
   (let ((docs (cl-remove-if-not 'jao-doc-session-is-doc (buffer-list))))
     (if (car docs)
         (progn (switch-to-buffer (car docs))
@@ -163,7 +166,7 @@
 ;;;###autoload
 (defun jao-afio-open-gnus ()
   (interactive)
-  (jao-org-agenda)
+  ;; (jao-org-agenda)
   (calendar)
   (find-file (expand-file-name "inbox.org" org-directory))
   (delete-other-windows)