Synch to Oort Gnus 200303301430.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ce09824..287ebc5 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2003-03-30  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * gnus-cache.el (gnus-cache-braid-nov): Revoke last change.
+
 2003-03-30  Simon Josefsson  <jas@extundo.com>
 
        * message.el (message-idna-inside-rhs-p): Narrow to header before
@@ -7,6 +11,18 @@
 
 2003-03-30  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+       * nnmail.el (nnmail-process-mmdf-mail-format): Indent.
+
+2003-03-28  Vasily Korytov  <deskpot@myrealbox.com>
+
+       * message.el (message-make-in-reply-to): Use
+       mail-extract-address-components to dentermine sender's
+       name/address.
+
+2003-03-30  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * nndoc.el (nndoc-type-alist): Move mime-parts further ahead. 
+
        * gnus-registry.el (gnus-registry-translate-to-alist): Make a
        valid lambda.
        (gnus-registry-translate-from-alist): Ditto.

diff --git a/lisp/gnus-cache.el b/lisp/gnus-cache.el
index 0194803..e9733a2 100644 (file)
--- a/lisp/gnus-cache.el
+++ b/lisp/gnus-cache.el
@@ -511,7 +511,6 @@ Returns the list of articles removed."
     (goto-char (point-min))
     (while cached
       (while (and (not (eobp))
-                 (looking-at "[0-9]+\t")
                  (< (read (current-buffer)) (car cached)))
        (forward-line 1))
       (beginning-of-line)

diff --git a/lisp/message.el b/lisp/message.el
index 9319ff0..d3e8b0a 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -5036,16 +5036,15 @@ If NOW, use that time instead."
     (let ((from (mail-header-from message-reply-headers))
          (date (mail-header-date message-reply-headers))
          (msg-id (mail-header-message-id message-reply-headers)))
-      (when msg-id
-       (concat msg-id
-               (when from
-                 (let ((pair (std11-extract-address-components from)))
-                   (concat "\n ("
-                           (or (car pair) (cadr pair))
-                           "'s message of \""
-                           (if (or (not date) (string= date ""))
-                               "(unknown date)" date)
-                           "\")"))))))))
+      (when from
+       (let ((name (std11-extract-address-components from)))
+         (concat msg-id (if msg-id " (")
+                 (or (car name)
+                     (nth 1 name))
+                 "'s message of \""
+                 (if (or (not date) (string= date ""))
+                     "(unknown date)" date)
+                 "\"" (if msg-id ")")))))))
 
 (defun message-make-distribution ()
   "Make a Distribution header."

diff --git a/lisp/nndoc.el b/lisp/nndoc.el
index 7de053d..32bb5d7 100644 (file)
--- a/lisp/nndoc.el
+++ b/lisp/nndoc.el
@@ -58,6 +58,9 @@ from the document.")
   `((mmdf
      (article-begin .  "^\^A\^A\^A\^A\n")
      (body-end .  "^\^A\^A\^A\^A\n"))
+    (mime-parts
+     (generate-head-function . nndoc-generate-mime-parts-head)
+     (article-transform-function . nndoc-transform-mime-parts))
     (nsmail
      (article-begin .  "^From - "))
     (news
@@ -98,9 +101,6 @@ from the document.")
      (body-end . "")
      (file-end . "")
      (subtype digest guess))
-    (mime-parts
-     (generate-head-function . nndoc-generate-mime-parts-head)
-     (article-transform-function . nndoc-transform-mime-parts))
     (standard-digest
      (first-article . ,(concat "^" (make-string 70 ?-) "\n *\n+"))
      (article-begin . ,(concat "^\n" (make-string 30 ?-) "\n *\n+"))