From fa3741c7090252e89a36c38729c7d7001e717294 Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Wed, 13 Nov 2019 23:17:43 -0500
Subject: [PATCH 1/1] emacs: try swapping out ebdb for bbdb

---
 .emacs.d/init.el                      | 72 ++++++++++++++++-----------
 .emacs.d/straight/versions/default.el |  2 +-
 2 files changed, 43 insertions(+), 31 deletions(-)

diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 06fd31f..183cd11 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -2584,47 +2584,59 @@ https://csclub.uwaterloo.ca/~abandali")
         ("r" . footnote-renumber-footnotes)
         ("s" . footnote-set-style)))
 
-(use-package ebdb
+(use-package bbdb
   :demand
   :after gnus
-  :bind (:map gnus-group-mode-map ("e" . ebdb))
+  :bind (:map gnus-group-mode-map ("e" . bbdb))
   :config
-  (setq ebdb-sources (b/var "ebdb"))
-  (with-eval-after-load 'swiper
-    (add-to-list 'swiper-font-lock-exclude 'ebdb-mode t)))
+  (bbdb-initialize 'gnus 'message)
+  :custom
+  (bbdb-complete-mail-allow-cycling t)
+  (bbdb-user-mail-address-re message-dont-reply-to-names))
 
-(use-feature ebdb-com
-  :after ebdb)
+(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-feature ebdb-complete
-  :after ebdb
-  :config
-  ;; (setq ebdb-complete-mail 'capf)
-  (ebdb-complete-enable))
+  (use-feature ebdb-com
+    :after ebdb)
 
-(use-feature ebdb-message
-  :demand
-  :after ebdb)
+  (use-feature ebdb-complete
+    :after ebdb
+    :config
+    ;; (setq ebdb-complete-mail 'capf)
+    (ebdb-complete-enable))
 
-;; (use-package company-ebdb
-;;   :config
-;;   (defun company-ebdb--post-complete (_) nil))
+  (use-feature ebdb-message
+    :demand
+    :after ebdb)
 
-(use-feature ebdb-gnus
-  :after ebdb
-  :custom
-  (ebdb-gnus-window-size 0.3))
+  ;; (use-package company-ebdb
+  ;;   :config
+  ;;   (defun company-ebdb--post-complete (_) nil))
 
-(use-feature ebdb-mua
-  :demand
-  :after ebdb
-  :custom (ebdb-mua-pop-up t))
+  (use-feature ebdb-gnus
+    :after ebdb
+    :custom
+    (ebdb-gnus-window-size 0.3))
 
-;; (use-package ebdb-message
-;;   :after ebdb)
+  (use-feature ebdb-mua
+    :demand
+    :after ebdb
+    :custom (ebdb-mua-pop-up t))
+
+  ;; (use-package ebdb-message
+  ;;   :after ebdb)
 
-;; (use-package ebdb-vcard
-;;   :after ebdb)
+  ;; (use-package ebdb-vcard
+  ;;   :after ebdb)
+  )
 
 (use-package message-x)
 
diff --git a/.emacs.d/straight/versions/default.el b/.emacs.d/straight/versions/default.el
index 4fe47ee..bd58970 100644
--- a/.emacs.d/straight/versions/default.el
+++ b/.emacs.d/straight/versions/default.el
@@ -2,6 +2,7 @@
  ("alloy-mode" . "0d05bdd10c77ec04c3d61eccf67e68c08284951f")
  ("amx" . "b46e77d8ef9d1edf225e67055001f7e85048f842")
  ("auth-password-store" . "847a1f54ed48856b4dfaaa184583ef2c84173edf")
+ ("bbdb" . "2bbe645ae71d84ad518e03dec698d4154af2f9f0")
  ("biblio.el" . "efeeab720cb8e3f95ddb4298d0cc62393cf237e9")
  ("boxquote.el" . "7e47e0e2853bc1215739b2e28f260e9eed93b2c5")
  ("bui.el" . "508577a7225b3d07eaefa9444064410af2518675")
@@ -14,7 +15,6 @@
  ("debbugs" . "4d9c772236193ab716b622956c6ae73fceb1a8d9")
  ("debpaste.el" . "6f2a400665062468ebd03a2ce1de2a73d9084958")
  ("diff-hl" . "f95d12343be67a9378249842911019939863b148")
- ("ebdb" . "3a2ab4c03771ef6e8db573e5219ed1ed68a773ee")
  ("edit-indirect" . "935ded353b9ed3da67bc61abf245c21b58d88864")
  ("el-dmenu" . "e8cc9b27c79d3ecc252267c082ab8e9c82eab264")
  ("elisp-refs" . "0a254e6a4dc7fa12857f8334fe6eefa72e49d1c9")
-- 
2.20.1