* mime-bbdb.el: Load "bbdb-hooks" when the symbol function

 `bbdb-extract-field-value' is not bound or it is set up as an autoloaded
 function. [cf. <emacs-mime-ja:799,842,843,844,845,846>]

diff --git a/ChangeLog b/ChangeLog
index e975292..5039c05 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-04-19  Katsumi Yamaoka   <yamaoka@jpl.org>
+
+       * mime-bbdb.el: Load "bbdb-hooks" when the symbol function
+       `bbdb-extract-field-value' is not bound or it is set up as an
+       autoloaded function. [cf. <emacs-mime-ja:799,842,843,844,845,846>]
+
 2001-04-17  YAMASHITA Junji   <ysjj@unixuser.org>
 
        * semi-def.el (mime-browse-url-regexp): Allow https.

diff --git a/mime-bbdb.el b/mime-bbdb.el
index 1b61d64..cc6f7f2 100644 (file)
--- a/mime-bbdb.el
+++ b/mime-bbdb.el
@@ -102,10 +102,15 @@ For framepop users: If empty, `framepop-banish' is used instead.")
     (progn
       ;; (require 'bbdb-hooks) ; not provided.
       ;; (or (fboundp 'bbdb-extract-field-value) ; defined as autoload
-      (or (fboundp 'bbdb-header-start)
-          (load "bbdb-hooks"))
+
+      ;; almost BBDB functions are autoloaded.
+      ;; (or (fboundp 'bbdb-header-start)
+      (or (and (fboundp 'bbdb-extract-field-value)
+              (not (eq 'autoload (car-safe (symbol-function
+                                            'bbdb-extract-field-value)))))
+         (load "bbdb-hooks"))
       (fset 'tm:bbdb-extract-field-value
-            (symbol-function 'bbdb-extract-field-value))
+           (symbol-function 'bbdb-extract-field-value))
       (defun bbdb-extract-field-value (field)
         (let ((value (tm:bbdb-extract-field-value field)))
           (and value