Sync with chaos-1_13.

* gnus.el (gnus-revision-number): Increment to 11.

* nnheader.el (nnheader-insert-nov): Use `mime-entity-fetch-field' instead of
`mime-fetch-field'.

* gnus-sum.el (gnus-summary-line-format-alist): Use `mime-entity-read-field'
instead of `mime-read-field'.
(gnus-article-sort-by-author): Likewise.

diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index 6606d7f..666ddb1 100644 (file)
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -956,9 +956,9 @@ For example: ((1 . cn-gb-2312) (2 . big5))."
     (?s gnus-tmp-subject-or-nil ?s)
     (?n gnus-tmp-name ?s)
     (?A (std11-address-string
-        (car (mime-read-field 'From gnus-tmp-header))) ?s)
+        (car (mime-entity-read-field gnus-tmp-header 'From))) ?s)
     (?a (or (std11-full-name-string
-            (car (mime-read-field 'From gnus-tmp-header)))
+            (car (mime-entity-read-field gnus-tmp-header 'From)))
            gnus-tmp-from) ?s)
     (?F gnus-tmp-from ?s)
     (?x ,(macroexpand '(mail-header-xref gnus-tmp-header)) ?s)
@@ -3698,11 +3698,11 @@ If LINE, insert the rebuilt thread starting on line LINE."
 (defsubst gnus-article-sort-by-author (h1 h2)
   "Sort articles by root author."
   (string-lessp
-   (let ((addr (car (mime-read-field 'From h1))))
+   (let ((addr (car (mime-entity-read-field h1 'From))))
      (or (std11-full-name-string addr)
         (std11-address-string addr)
         ""))
-   (let ((addr (car (mime-read-field 'From h2))))
+   (let ((addr (car (mime-entity-read-field h2 'From))))
      (or (std11-full-name-string addr)
         (std11-address-string addr)
         ""))

diff --git a/lisp/gnus.el b/lisp/gnus.el
index 2004900..32516ef 100644 (file)
--- a/lisp/gnus.el
+++ b/lisp/gnus.el
@@ -268,7 +268,7 @@ is restarted, and sometimes reloaded."
 (defconst gnus-version-number "6.14.1"
   "Version number for this version of gnus.")
 
-(defconst gnus-revision-number "10"
+(defconst gnus-revision-number "11"
   "Revision number for this version of gnus.")
 
 (defconst gnus-original-version-number "5.8.3"

diff --git a/lisp/nnheader.el b/lisp/nnheader.el
index c75bde2..e0ec1e1 100644 (file)
--- a/lisp/nnheader.el
+++ b/lisp/nnheader.el
@@ -341,8 +341,8 @@ on your system, you could say something like:
   (princ (mail-header-number header) (current-buffer))
   (insert
    "\t"
-   (or (mime-fetch-field 'Subject header) "(none)") "\t"
-   (or (mime-fetch-field 'From header) "(nobody)") "\t"
+   (or (mime-entity-fetch-field header 'Subject) "(none)") "\t"
+   (or (mime-entity-fetch-field header 'From) "(nobody)") "\t"
    (or (mail-header-date header) "") "\t"
    (or (mail-header-id header)
        (nnmail-message-id))