[elpa] master 941118a 1/3: Fix autoloads for BBDB functions

[Eric Abrahamsen]

branch: master
commit 941118a4eb26e1a0e5538ef7f7d10fbcef40571e
Author: Eric Abrahamsen <e...@ericabrahamsen.net>
Commit: Eric Abrahamsen <e...@ericabrahamsen.net>

    Fix autoloads for BBDB functions
    
    * packages/gnorb/gnorb-bbdb.el: We're no longer requiring anything
      directly, only autoloading. This will allow users to install Gnorb
      without having BBDB installed at all -- though they can still
      trigger errors by using autoloaded Gnorb functions that depend on
      BBDB. I suppose I could be very tidy and catch those errors.
    * packages/gnorb/gnorb-org.el: Fix existing autoloads -- pointing at
      wrong file.
---
 packages/gnorb/gnorb-bbdb.el | 16 +++++++++++++---
 packages/gnorb/gnorb-org.el  | 10 ++++------
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/packages/gnorb/gnorb-bbdb.el b/packages/gnorb/gnorb-bbdb.el
index d391e3a..5fa4116 100644
--- a/packages/gnorb/gnorb-bbdb.el
+++ b/packages/gnorb/gnorb-bbdb.el
@@ -27,9 +27,19 @@
 
 ;;; Code:
 
-(require 'bbdb)
-(require 'bbdb-com)
-(require 'bbdb-mua)
+;; Don't explicity require BBDB libraries.  BBDB is the "weakest leg"
+;; of the Gnorb tripod: it has the least functionality, and many
+;; people are using Gnorb without BBDB. So don't require, only
+;; autoload.
+
+;; (require 'bbdb)
+;; (require 'bbdb-com)
+;; (require 'bbdb-mua)
+
+(autoload 'bbdb-do-records "bbdb-com")
+(autoload 'bbdb-completing-read-record "bbdb-com")
+(autoload 'bbdb-current-record "bbdb")
+
 (require 'gnorb-utils)
 (require 'cl-lib)
 
diff --git a/packages/gnorb/gnorb-org.el b/packages/gnorb/gnorb-org.el
index c99cfff..51eb715 100644
--- a/packages/gnorb/gnorb-org.el
+++ b/packages/gnorb/gnorb-org.el
@@ -32,17 +32,15 @@
 (defvar bbdb-buffer-name)
 (defvar message-alternative-emails)
 
-;; This many autoloads means either we should require bbdb outright,
-;; or something needs refactoring.
 (autoload 'gnorb-bbdb-configure-posting-styles "gnorb-bbdb")
 (autoload 'gnorb-registry-org-id-search "gnorb-registry")
-(autoload 'bbdb-completing-read-record "bbdb")
+(autoload 'bbdb-completing-read-record "bbdb-com")
 (autoload 'bbdb-record-name "bbdb")
-(autoload 'bbdb-message-search "bbdb")
-(autoload 'bbdb-mail-address "bbdb")
+(autoload 'bbdb-message-search "bbdb-com")
+(autoload 'bbdb-mail-address "bbdb-com")
 (autoload 'bbdb-record-xfield "bbdb")
 (autoload 'bbdb-records "bbdb")
-(autoload 'bbdb-search "bbdb")
+(autoload 'bbdb-search "bbdb-com")
 (autoload 'bbdb-display-records "bbdb")
 
 (defgroup gnorb-org nil