projects
/
elisp
/
semi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* mime-view.el (mime-display-multipart/related): New function; set up
[elisp/semi.git]
/
mime-bbdb.el
diff --git
a/mime-bbdb.el
b/mime-bbdb.el
index
62bc191
..
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
(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
(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
(defun bbdb-extract-field-value (field)
(let ((value (tm:bbdb-extract-field-value field)))
(and value
@@
-161,13
+166,13
@@
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))
(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)
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)))
(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
from))
)
(if from