[elpa] externals/gnorb e1129e9 170/449: Fix problems when BBDB is not present and gnorb-bbdb is not loaded.

[Stefan Monnier]

branch: externals/gnorb
commit e1129e929008abed902cf3befdb6f9cc03895728
Author: Malcolm Purvis <malcolm@purvis.id.au>
Commit: Eric Abrahamsen <eric@ericabrahamsen.net>

    Fix problems when BBDB is not present and gnorb-bbdb is not loaded.
---
 lisp/gnorb-org.el | 8 ++++----
 lisp/gnorb.el     | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lisp/gnorb-org.el b/lisp/gnorb-org.el
index 0568d3c..00ac6a4 100644
--- a/lisp/gnorb-org.el
+++ b/lisp/gnorb-org.el
@@ -547,8 +547,8 @@ current heading."
          (when recs
            (dolist (r recs)
              (push (bbdb-mail-address r) mails)))
-         (when (and gnorb-bbdb-posting-styles
-                    recs)
+         (when (and recs
+                    gnorb-bbdb-posting-styles)
            (add-hook 'message-mode-hook
                      (lambda ()
                        (gnorb-bbdb-configure-posting-styles (cdr recs))
@@ -767,7 +767,6 @@ search."
   ;; remove non-tag contents from the query string, and then make a
   ;; new call to `org-make-tags-matcher'.
   (interactive)
-  (require 'gnorb-bbdb)
   (let (recs)
     (cond ((and
            (and (eq major-mode 'org-agenda-mode)
@@ -824,7 +823,8 @@ search."
       (when (called-interactively-p 'any)
        (message "No relevant BBDB records")))))
 
-(add-hook 'org-agenda-finalize-hook 'gnorb-org-popup-bbdb)
+(if (featurep 'gnorb-bbdb)
+    (add-hook 'org-agenda-finalize-hook 'gnorb-org-popup-bbdb))
 
 ;;; Groups from the gnorb gnus server backend
 
diff --git a/lisp/gnorb.el b/lisp/gnorb.el
index 6304ec6..d972ee8 100644
--- a/lisp/gnorb.el
+++ b/lisp/gnorb.el
@@ -27,8 +27,8 @@
 (require 'gnorb-utils)
 (require 'nngnorb)
 (require 'gnorb-gnus)
-(require 'gnorb-org)
 (require 'gnorb-bbdb)
+(require 'gnorb-org)
 
 (provide 'gnorb)
 ;;; gnorb.el ends here