summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKatsumi Yamaoka <yamaoka@jpl.org>2011-04-20 00:43:48 +0000
committerKatsumi Yamaoka <yamaoka@jpl.org>2011-04-20 00:43:48 +0000
commit6b1f6ce90ed255e05fb843cde2f738a88b9fef14 (patch)
tree43fae8cfdfdea0e5deb3ca25c31be01684deda72
parent602ea69dc7a93969742958ee6af3feae23cd1e02 (diff)
downloademacs-6b1f6ce90ed255e05fb843cde2f738a88b9fef14.tar.gz
gnus-registry.el (gnus-registry-action, gnus-registry-fetch-header-fast):
Don't use mail-header that looks an internal function of mailheader.el.
-rw-r--r--lisp/gnus/ChangeLog6
-rw-r--r--lisp/gnus/gnus-registry.el8
2 files changed, 10 insertions, 4 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 8417d37cadf..35531df0ad2 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,9 @@
+2011-04-20 Katsumi Yamaoka <yamaoka@jpl.org>
+
+ * gnus-registry.el (gnus-registry-action)
+ (gnus-registry-fetch-header-fast):
+ Don't use mail-header that looks an internal function of mailheader.el.
+
2011-04-18 Katsumi Yamaoka <yamaoka@jpl.org>
* gnus-registry.el: Eliminate cl functions.
diff --git a/lisp/gnus/gnus-registry.el b/lisp/gnus/gnus-registry.el
index 697dc373b1f..009786dec80 100644
--- a/lisp/gnus/gnus-registry.el
+++ b/lisp/gnus/gnus-registry.el
@@ -304,8 +304,8 @@ This is not required after changing `gnus-registry-cache-file'."
(let* ((id (mail-header-id data-header))
(subject (mail-header-subject data-header))
(recipients (gnus-registry-sort-addresses
- (or (ignore-errors (mail-header "Cc" data-header)) "")
- (or (ignore-errors (mail-header "To" data-header)) "")))
+ (or (cdr (assq "Cc" data-header)) "")
+ (or (cdr (assq "To" data-header)) "")))
(sender (nth 0 (gnus-registry-extract-addresses
(mail-header-from data-header))))
(from (gnus-group-guess-full-name-from-command-method from))
@@ -742,8 +742,8 @@ Addresses without a name will say \"noname\"."
(if (and (numberp article)
(assoc article (gnus-data-list nil)))
(gnus-string-remove-all-properties
- (mail-header header (gnus-data-header
- (assoc article (gnus-data-list nil)))))
+ (cdr (assq header (gnus-data-header
+ (assoc article (gnus-data-list nil))))))
nil))
;; registry marks glue