From d6cdd1fd112d43fe4df3617ca82773debb16be68 Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Fri, 22 Nov 2019 08:48:42 -0500
Subject: [PATCH] emacs: update packages, switch from bbdb back to ebdb for now

---
 .emacs.d/init.el                      | 69 +++++++++++++--------------
 .emacs.d/straight/versions/default.el | 18 +++----
 2 files changed, 43 insertions(+), 44 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)
 
diff --git a/.emacs.d/straight/versions/default.el b/.emacs.d/straight/versions/default.el
index 20b2bae..fe92d45 100644
--- a/.emacs.d/straight/versions/default.el
+++ b/.emacs.d/straight/versions/default.el
@@ -2,7 +2,6 @@
  ("alloy-mode" . "0d05bdd10c77ec04c3d61eccf67e68c08284951f")
  ("amx" . "b46e77d8ef9d1edf225e67055001f7e85048f842")
  ("auth-password-store" . "847a1f54ed48856b4dfaaa184583ef2c84173edf")
- ("bbdb" . "2bbe645ae71d84ad518e03dec698d4154af2f9f0")
  ("biblio.el" . "efeeab720cb8e3f95ddb4298d0cc62393cf237e9")
  ("boxquote.el" . "7e47e0e2853bc1215739b2e28f260e9eed93b2c5")
  ("bui.el" . "508577a7225b3d07eaefa9444064410af2518675")
@@ -12,9 +11,10 @@
  ("company-mode" . "d943198e26baccbbae7fa1cdebcd9fcb89c525d0")
  ("crux" . "903db7b1a2052f4959d934cae26ec40a3f323ed4")
  ("dash.el" . "e85ed7aa93ef0959b630607bca17af90c74b34be")
- ("debbugs" . "aef21a1bfc3d52aa64732933a7e8e1baa3c55ea1")
+ ("debbugs" . "966743ee5bf8b9cd4fe32500af684904c2ced3e8")
  ("debpaste.el" . "6f2a400665062468ebd03a2ce1de2a73d9084958")
  ("diff-hl" . "f95d12343be67a9378249842911019939863b148")
+ ("ebdb" . "3a2ab4c03771ef6e8db573e5219ed1ed68a773ee")
  ("edit-indirect" . "935ded353b9ed3da67bc61abf245c21b58d88864")
  ("el-dmenu" . "e8cc9b27c79d3ecc252267c082ab8e9c82eab264")
  ("elisp-refs" . "0a254e6a4dc7fa12857f8334fe6eefa72e49d1c9")
@@ -22,7 +22,7 @@
  ("emacs-doom-themes" . "3c6f874a03f378c4dfed5e913ea5490402d8a233")
  ("emacs-htmlize" . "86f22f211e9230857197c42a9823d3f05381deed")
  ("emacs-which-key" . "a916c9ae28e961922d8d8419e633f9321fcdbe53")
- ("emacsmirror-mirror" . "eac41b41e76db637f14c1d18bdd36b1a58c32388")
+ ("emacsmirror-mirror" . "10c535059849451655c426d9b3b5fa9c7598011f")
  ("emacsql" . "a118b6c95af1306f0288a383d274b5dd93efbbda")
  ("emmet-mode" . "1acb821e0142136344ccf40c1e5fb664d7db2e70")
  ("epl" . "78ab7a85c08222cd15582a298a364774e3282ce6")
@@ -34,7 +34,7 @@
  ("exwm" . "97249a9786b08f11b0df0d0cae8ca02d47786625")
  ("exwm-edit" . "80c1cbecafde96a59e620d8fa7e5510a5a7bbd3d")
  ("f.el" . "1814209e2ff43cf2e6d38c4cd476218915f550fb")
- ("flycheck" . "c9331a683a9ef78fb74daed69db3f44de48b26d7")
+ ("flycheck" . "a6768d609dee9afec1e085e55d3854b4d6b12824")
  ("forge" . "ebe499ec47f87c0d2ed24ff4082c2b2a483e5fcd")
  ("geiser" . "957d4757e48a415c369010011860a71302e5eba5")
  ("george-mode" . "e377ef5bd21783046fc5d02dd4fdc695e9baccc7")
@@ -42,12 +42,12 @@
  ("gntp.el" . "767571135e2c0985944017dc59b0be79af222ef5")
  ("gnu-elpa-mirror" . "aff85e0b92a41ee6efce6caf35277bc1ed11ff74")
  ("go-mode.el" . "cad6d0a522f8f5c351a1332bcd54bd5ffd8ce30d")
- ("guix.el" . "de8978d6d52d1b3f161a249df081dc4280673f58")
- ("helm" . "45bbd9f4562c82781df46587bf97b8ae0ba75c03")
+ ("guix.el" . "c2796e68868c91253b6aca422a9ae07363aa03a9")
+ ("helm" . "0b87079debb40900b8494442d2a4d373884e054e")
  ("helm-bibtex" . "d4471232be26793fbf56c0ac3690b5f537c378b9")
  ("helpful" . "e2609e4ae9e058bd8be6239681b2f22195628f28")
  ("hl-todo" . "6c79749236c8da28183092607f824727464079fd")
- ("hydra" . "0c5dcf7ab9002c1e93f04dd28f8b0c8e60f091bf")
+ ("hydra" . "d38c63d3d85a06fd34b28626d7ebd97bb05db48c")
  ("key-chord" . "72443e9ff3c4f1c3ccaced3130236801efde3d83")
  ("lean-mode" . "b5ba739f68ef731c03247bf6db2708502c8ac46c")
  ("let-alist" . "57561d7d9267da48e8b7ab1f3bd45c9d05951289")
@@ -63,7 +63,7 @@
  ("mwim.el" . "b4f3edb4c0fb8f8b71cecbf8095c2c25a8ffbf85")
  ("no-littering" . "64de979ffba8af5541fd072b9227ec6b4c3c940f")
  ("oddmuse-curl" . "167520342f206c6451344d271e66f0f520664021")
- ("org" . "3649d95b1360033796b7aa5edba29d9e4afb9aff")
+ ("org" . "43c086f4f742ee4d1b4cad2895b27a5a80b5f375")
  ("org-pdftools" . "c48942e616bef7dcf477a0df4e2982e325f8f646")
  ("org-ref" . "58ae484729aa2027fcc3283a75f4c2c19cf499a2")
  ("page-break-lines" . "2e1d274e11071bb8daea4d6f4c0369c84466de7a")
@@ -82,7 +82,7 @@
  ("shrink-path.el" . "c14882c8599aec79a6e8ef2d06454254bb3e1e41")
  ("smart-mode-line" . "999be065b195f2eddb4e1b629f99038d832d44b7")
  ("soap-client" . "9e77b71a551f68d7e02290cb81ff0ddd328c20c0")
- ("straight.el" . "cb7935dcfc636b5606e92a5fbd1022b39195a92a")
+ ("straight.el" . "6b33d326425282c5f560f5d99c51ec22a1131caa")
  ("swiper" . "2fb4c9f8fbcba50c3d24fa49f844100cac5cc651")
  ("switch-buffer-functions-el" . "b8d8e01e21ae8c8c84234dddeb3cc8250814f7ba")
  ("tablist" . "8079801527da1f596bc942162026328d7bdf6ad9")
-- 
2.20.1