X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=mime-bbdb.el;h=cc6f7f28266c524fead91762b246b301b8db5fab;hb=5a737ec4d697ec1f1e6db68fed815669d8cd4bbd;hp=1b61d64966b7e5c397fffbfccb125499f1efa86f;hpb=d1f3df186339f3d2b91050fb1f079590c8fc30d3;p=elisp%2Fsemi.git

diff --git a/mime-bbdb.el b/mime-bbdb.el
index 1b61d64..cc6f7f2 100644
--- 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