2 files changed, 8 insertions, 7 deletions

@@ -1303,13 +1303,15 @@ specific to most general, they are these:
                    :files (:defaults
                            (:exclude "helm-dogears.el"))))
   (:option (append savehist-additional-variables) 'dogears-list)
-  (dolist (mode '(magit-status-mode
-                  elfeed-show-mode
-                  elfeed-search-mode))
-    (:option (append dogears-ignore-modes) mode))
+  (with-eval-after-load 'dogears
+    (dolist (mode '(magit-status-mode
+                    elfeed-show-mode
+                    elfeed-search-mode))
+      (:option (append dogears-ignore-modes) mode)))
   (:global "M-g d" dogears-go
            "M-g M-b" dogears-back
            "M-g M-f" dogears-forward)
+  (:autoload dogears-mode)
   (dogears-mode +1))
 
 (setup (:straight edit-indirect))
@@ -1361,6 +1363,7 @@ specific to most general, they are these:
                              ("youtube.com" video)
                              ("tilde.news" social)
                              ("xkcd.com" comics)))))
+  (:autoload elfeed-set-timeout)
   (elfeed-set-timeout 3600)
   (elfeed-protocol-enable)
   (:advise elfeed :after
@@ -1685,7 +1688,7 @@ browser defined in `browse-url-secondary-browser-function'."
     (:with-mode help-mode (:bind key #'link-hint-open-link))
     (:with-feature helpful (:bind key #'link-hint-open-link))
     (:with-mode Info-mode (:bind key #'link-hint-open-link))
-    (:with-mode reading-mode (:bind key #'link-hint-open-link))))
+    (:with-feature reading (:bind key #'link-hint-open-link))))
 
 (setup (:straight lua-mode)
   (:file-match (rx ".lua" eos)))
@@ -17,8 +17,6 @@
 
 ;;; Code:
 
-(require 'olivetti)
-
 (defvar-local //indicate-empty-lines nil)
 (defvar-local //indicate-buffer-boundaries nil)