gnus-registry.el (gnus-registry-action, gnus-registry-fetch-header-fast):

 Don't use mail-header that looks an internal function of mailheader.el.

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 8417d37cadffdeb9eb77d9b7c1608341de8899d3..35531df0ad2c86f8f8ef8c8a4e2b9d28578b9742 100644 (file)
--- 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 697dc373b1ff2bbbcd394aed813c04f5d5f02016..009786dec80f9c4da42ac2e1c0b7f51739f19fd5 100644 (file)
--- 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