emacs: update packages, switch from bbdb back to ebdb for now

1 files changed, 34 insertions, 35 deletions

diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 82a4002..d260380 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -2623,6 +2623,7 @@ https://csclub.uwaterloo.ca/~abandali")
         ("s" . footnote-set-style)))
 
 (use-package bbdb
+  :disabled
   :demand
   :after gnus
   :bind (:map gnus-group-mode-map ("e" . bbdb))
@@ -2632,49 +2633,47 @@ https://csclub.uwaterloo.ca/~abandali")
   (bbdb-complete-mail-allow-cycling t)
   (bbdb-user-mail-address-re message-dont-reply-to-names))
 
-(comment
-  (use-package ebdb
-    :demand
-    :after gnus
-    :bind (:map gnus-group-mode-map ("e" . ebdb))
-    :config
-    (setq ebdb-sources (b/var "ebdb"))
-    (with-eval-after-load 'swiper
-      (add-to-list 'swiper-font-lock-exclude 'ebdb-mode t)))
+(use-package ebdb
+  :demand
+  :after gnus
+  :bind (:map gnus-group-mode-map ("e" . ebdb))
+  :config
+  (setq ebdb-sources (b/var "ebdb"))
+  (with-eval-after-load 'swiper
+    (add-to-list 'swiper-font-lock-exclude 'ebdb-mode t)))
 
-  (use-feature ebdb-com
-    :after ebdb)
+(use-feature ebdb-com
+  :after ebdb)
 
-  (use-feature ebdb-complete
-    :after ebdb
-    :config
-    ;; (setq ebdb-complete-mail 'capf)
-    (ebdb-complete-enable))
+(use-feature ebdb-complete
+  :after ebdb
+  :config
+  ;; (setq ebdb-complete-mail 'capf)
+  (ebdb-complete-enable))
 
-  (use-feature ebdb-message
-    :demand
-    :after ebdb)
+(use-feature ebdb-message
+  :demand
+  :after ebdb)
 
-  ;; (use-package company-ebdb
-  ;;   :config
-  ;;   (defun company-ebdb--post-complete (_) nil))
+;; (use-package company-ebdb
+;;   :config
+;;   (defun company-ebdb--post-complete (_) nil))
 
-  (use-feature ebdb-gnus
-    :after ebdb
-    :custom
-    (ebdb-gnus-window-size 0.3))
+(use-feature ebdb-gnus
+  :after ebdb
+  :custom
+  (ebdb-gnus-window-size 0.3))
 
-  (use-feature ebdb-mua
-    :demand
-    :after ebdb
-    :custom (ebdb-mua-pop-up t))
+(use-feature ebdb-mua
+  :demand
+  :after ebdb
+  :custom (ebdb-mua-pop-up t))
 
-  ;; (use-package ebdb-message
-  ;;   :after ebdb)
+;; (use-package ebdb-message
+;;   :after ebdb)
 
-  ;; (use-package ebdb-vcard
-  ;;   :after ebdb)
-  )
+;; (use-package ebdb-vcard
+;;   :after ebdb)
 
 (use-package message-x)