;; 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:
(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
(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))