From 316a62178963b14b96e37c54d43d495899760720 Mon Sep 17 00:00:00 2001
From: Vasudev Kamath <vasudev@copyninja.info>
Date: Wed, 7 Nov 2018 11:52:04 +0530
Subject: Move to bbdb3 bbdb does not build properly for Debian

---
 config.el   | 2 +-
 funcs.el    | 2 +-
 packages.el | 6 ++++++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/config.el b/config.el
index 9c6e537..598d8d9 100644
--- a/config.el
+++ b/config.el
@@ -82,7 +82,7 @@
          (address "vasudev@debian.org"))))
 
 ;; Enable bbdb configurations
-(require 'bbdb-autoloads)
+(require 'bbdb-loaddefs)
 (require 'bbdb)
 (bbdb-initialize 'message 'gnus 'sendmail)
 (setq bbdb-file "~/.bbdb.db")
diff --git a/funcs.el b/funcs.el
index a70d996..03e74b5 100644
--- a/funcs.el
+++ b/funcs.el
@@ -55,7 +55,7 @@
 
 ;; Functions copied from
 ;; https://notmuchmail.org/pipermail/notmuch/2012/011692.html
-(require 'bbdb-autoloads)
+(require 'bbdb-loaddefs)
 (require 'bbdb)
 (defun bbdb/notmuch-snarf-header (header)
   (let ((text (notmuch-show-get-header header)))
diff --git a/packages.el b/packages.el
index 1aa0c14..6c7c898 100644
--- a/packages.el
+++ b/packages.el
@@ -31,11 +31,17 @@
 
 (defconst notmuch-packages
   '(
+    bbdb
     notmuch
     smtpmail-multi
     gnus
     ))
 
+(defun notmuch/init-bbdb ()
+  (use-package bbdb
+               :defer t)
+  )
+
 (defun notmuch/init-notmuch ()
   (use-package notmuch
     :defer t
-- 
cgit v1.2.3