[emacs] fix up a few defer-related issues

also, no need for the manual company-ebdb hook in version 1.1

diff --git a/init.org b/init.org
index 505a793..cbbd321 100644 (file)
--- a/init.org
+++ b/init.org
@@ -789,11 +789,8 @@ In short, my favourite way of life.
                  ("\\subsubsection{%s}" . "\\subsubsection*{%s}")
                  ("\\paragraph{%s}"     . "\\paragraph*{%s}")
                  ("\\subparagraph{%s}"  . "\\subparagraph*{%s}"))
                  ("\\subsubsection{%s}" . "\\subsubsection*{%s}")
                  ("\\paragraph{%s}"     . "\\paragraph*{%s}")
                  ("\\subparagraph{%s}"  . "\\subparagraph*{%s}"))

-               t))
-
-(use-package ox-beamer
-  :demand
-  :after ox)
+               t)
+  (require 'ox-beamer))

 #+end_src
 
 **** asynchronous tangle
 #+end_src
 
 **** asynchronous tangle


@@ -2248,6 +2245,7 @@ Convenient footnotes in =message-mode=.
 
 #+begin_src emacs-lisp
 (use-package ebdb
 
 #+begin_src emacs-lisp
 (use-package ebdb

+  :defer 2

   :after gnus
   :bind (:map gnus-group-mode-map ("e" . ebdb))
   :config
   :after gnus
   :bind (:map gnus-group-mode-map ("e" . ebdb))
   :config


@@ -2264,16 +2262,12 @@ Convenient footnotes in =message-mode=.
 ;;   (ebdb-complete-enable))
 
 (use-package company-ebdb
 ;;   (ebdb-complete-enable))
 
 (use-package company-ebdb

-  :after (:all company message)
+  :defer 2

   :config
   :config

-  (defun company-ebdb--post-complete (_) nil)
-  :hook
-  (message-mode . (lambda ()
-                    (add-to-list (make-local-variable 'company-backends)
-                                 'company-ebdb))))
+  (defun company-ebdb--post-complete (_) nil))

 
 (use-package ebdb-gnus
 
 (use-package ebdb-gnus

-  :demand
+  :defer 3

   :after ebdb
   :custom
   (ebdb-gnus-window-configuration
   :after ebdb
   :custom
   (ebdb-gnus-window-configuration


@@ -2285,7 +2279,7 @@ Convenient footnotes in =message-mode=.
                            (ebdb-gnus 0.3))))))
 
 (use-package ebdb-mua
                            (ebdb-gnus 0.3))))))
 
 (use-package ebdb-mua

-  :demand
+  :defer 3

   :after ebdb
   ;; :custom (ebdb-mua-pop-up nil)
   )
   :after ebdb
   ;; :custom (ebdb-mua-pop-up nil)
   )