attic

1 files changed, 7 insertions, 45 deletions

diff --git a/init.org b/init.org
index 4cbc57b..0b4dcd6 100644
--- a/init.org
+++ b/init.org
@@ -1640,15 +1640,6 @@
 * PDFs
 *** doc-view and pdf-tools
     #+begin_src emacs-lisp
-      ;; this is an ugly hack: when jao-minibuffer is active,
-      ;; somehow docview scrolling is not triggering a refresh,
-      ;; specially for scroll down movements, so we advice the
-      ;; scrolling functions to force a redisplay by going to
-      ;; another window.
-      (defun jao--refresh (&rest _rest)
-          (let ((jao-minibuffer-mode nil))
-            (other-window 1) (other-window -1)))
-
       (use-package doc-view
         :init
         (setq doc-view-cache-directory "~/.emacs.d/cache/docview"
@@ -1656,42 +1647,12 @@
               doc-view-continuous t
               doc-view-conversion-refresh-interval 1)
 
-        :config
-
-        (dolist (f '(doc-view-scroll-up-or-next-page
-                     doc-view-scroll-down-or-previous-page
-                     doc-view-previous-line-or-previous-page
-                     doc-view-next-line-or-next-page
-                     image-forward-hscroll
-                     image-backward-hscroll
-                     image-scroll-down
-                     image-scroll-up
-                     image-eol
-                     image-bol))
-          (advice-add f :after #'jao--refresh))
-
         :bind (:map doc-view-mode-map
                     ("j" . doc-view-next-line-or-next-page)
                     ("J" . doc-view-scroll-up-or-next-page)
                     ("k" . doc-view-previous-line-or-previous-page)
                     ("K" . doc-view-scroll-down-or-previous-page)))
 
-      (use-package jao-doc-view
-        :config
-        (dolist (f '(image-forward-hscroll
-                     image-backward-hscroll
-                     image-scroll-down
-                     image-scroll-up
-                     image-eol
-                     image-bol))
-          (advice-add f :after #'jao--refresh))
-
-        :bind (:map doc-view-mode-map
-                    ("b" . jao-doc-view-back)
-                    ("B" . jao-doc-view-forward)
-                    ("S" . jao-doc-view-save-session)
-                    ("u" . jao-doc-view-visit-url)))
-
       (use-package pdf-tools
         :ensure t
         :demand t
@@ -1704,12 +1665,6 @@
         :config
         (pdf-tools-install)
 
-        (dolist (f '(pdf-view-scroll-up-or-next-page
-                     pdf-view-scroll-down-or-previous-page
-                     pdf-view-previous-line-or-previous-page
-                     pdf-view-next-line-or-next-page))
-          (advice-add f :after #'jao--refresh))
-
         :diminish ((pdf-view-midnight-minor-mode . ""))
 
         :bind (:map pdf-view-mode-map
@@ -1723,6 +1678,13 @@
         :ensure t
         :demand t
         :after doc-view)
+
+      (use-package jao-doc-view
+        :bind (:map doc-view-mode-map
+                    ("b" . jao-doc-view-back)
+                    ("B" . jao-doc-view-forward)
+                    ("S" . jao-doc-view-save-session)
+                    ("u" . jao-doc-view-visit-url)))
     #+end_src
 *** open pdfs
     #+begin_src emacs-lisp