X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=mime-bbdb.el;h=515b2d9f98cc0949265ea2f8c8f917e480d4f812;hb=83b8b7fd1a73b6975330b7fd71905058b5cf521d;hp=381655cb53d44387b84cfdacf2c2a37b3e949f1e;hpb=c0166f99c9a0637871ddf8b7c9025c8257d1f285;p=elisp%2Fsemi.git

diff --git a/mime-bbdb.el b/mime-bbdb.el
index 381655c..515b2d9 100644
--- a/mime-bbdb.el
+++ b/mime-bbdb.el
@@ -21,8 +21,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
@@ -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
@@ -161,18 +166,18 @@ the user confirms the creation."
     (if bbdb-use-pop-up
         (mime-bbdb/pop-up-bbdb-buffer offer-to-create)
       (let* ((message (get-text-property (point-min) 'mime-view-entity))
-	     (from (mime-fetch-field 'From message))
+	     (from (mime-entity-fetch-field message 'From))
 	     addr)
 	(if (or (null from)
-                (null (setq addr (car (mime-read-field 'From message))))
+                (null (setq addr (car (mime-entity-read-field message 'From))))
                 (string-match (bbdb-user-mail-names)
 			      (std11-address-string addr)))
-            (setq from (or (mime-fetch-field 'To message)
+            (setq from (or (mime-entity-fetch-field message 'To)
 			   from))
 	  )
         (if from
             (bbdb-annotate-message-sender
-             (eword-decode-structured-field-body from) t
+             (mime-decode-field-body from 'From) t
              (or (bbdb-invoke-hook-for-value mime-bbdb/auto-create-p)
                  offer-to-create)
              offer-to-create))