From: kaoru <kaoru>
Date: Wed, 12 Dec 2001 05:15:23 +0000 (+0000)
Subject: Use `load' instead of `require' bbdb-autoloads for BBDB 2.20.
X-Git-Tag: wl-2_8-root~25
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=982aa5df819e6578c89298e9957abb245bf65f59;p=elisp%2Fwanderlust.git

Use `load' instead of `require' bbdb-autoloads for BBDB 2.20.
---

diff --git a/utils/ChangeLog b/utils/ChangeLog
index abb39b0..eb3b3f5 100644
--- a/utils/ChangeLog
+++ b/utils/ChangeLog
@@ -1,6 +1,7 @@
 2001-12-12  TAKAHASHI Kaoru  <kaoru@kaisei.org>
 
 	* bbdb-wl.el (bbdb-wl-setup): require bbdb-autoloads if exists.
+	Use `load' instead of `require' bbdb-autoloads for BBDB 2.20.
 
 2001-10-06  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
 
diff --git a/utils/bbdb-wl.el b/utils/bbdb-wl.el
index ec01dc0..3ba6872 100644
--- a/utils/bbdb-wl.el
+++ b/utils/bbdb-wl.el
@@ -54,10 +54,13 @@
 	     (lambda ()
 ;;;	       (local-set-key "\M-\t" 'bbdb-complete-name)
 	       (define-key (current-local-map) "\M-\t" 'bbdb-complete-name))))
-  ;; BBDB 2.00.06 or earlier: (provide 'bbdb-autoloads) in auto-autoloads.el
+  ;; BBDB 2.00.06 or earlier:
+  ;;  auto-autoloads.el includes (provide 'bbdb-autoloads)
+  ;;  Don't exist bbdb-autoloads.el
   (when (and (not (featurep 'bbdb-autoloads))
 	     (module-installed-p 'bbdb-autoloads))
-    (require 'bbdb-autoloads)))
+    ;; BBDB 2.20: bbdb-autoloads.el NOT includes (provide 'bbdb-autoloads)
+    (load "bbdb-autoloads")))
 
 (defun bbdb-wl-exit ()
   (let (bbdb-buf)