Merging Gnorb commits up to 1.0.1

[gnu-emacs-elpa] / packages / gnorb / gnorb.el

diff --git a/packages/gnorb/gnorb.el b/packages/gnorb/gnorb.el
index c0db6af8886ffd41ceae790df0fb0e80e228bed8..22531d21018125342f2cc378deffb61ae587486e 100644 (file)
--- a/packages/gnorb/gnorb.el
+++ b/packages/gnorb/gnorb.el
@@ -2,7 +2,7 @@
 
 ;; Copyright (C) 2014  Free Software Foundation, Inc.
 
-;; Version: 1
+;; Version: 1.0.1
 ;; Package-Requires: ((cl-lib "0.5"))
 
 ;; Maintainer: Eric Abrahamsen <eric@ericabrahamsen.net>
@@ -31,13 +31,14 @@
 
 ;;; Code:
 
-(if t (require 'bbdb))      ;`if'-trick avoids loading bbdb during compilation!
-(require 'gnorb-utils)
-(require 'nngnorb)
-(require 'gnorb-gnus)
-(require 'gnorb-bbdb)
-(require 'gnorb-org)
-(require 'gnorb-registry)
+(with-eval-after-load 'gnus
+ (require 'nngnorb)
+ (require 'gnorb-gnus)
+ (require 'gnorb-registry))
+(with-eval-after-load 'bbdb
+  (require 'gnorb-bbdb))
+(with-eval-after-load 'org
+ (require 'gnorb-org))
 
 (provide 'gnorb)
 ;;; gnorb.el ends here