T-gnus 6.16.3 revision 00.

[elisp/gnus.git-] / lisp / nndiary.el

diff --git a/lisp/nndiary.el b/lisp/nndiary.el
index 45aac6c..51cbd9a 100644 (file)
--- a/lisp/nndiary.el
+++ b/lisp/nndiary.el
@@ -1,6 +1,6 @@
 ;;; nndiary.el --- A diary backend for Gnus
 
-;; Copyright (C) 1999, 2000, 2001
+;; Copyright (C) 1999, 2000, 2001, 2003
 ;;        Free Software Foundation, Inc.
 
 ;; Author:        Didier Verna <didier@xemacs.org>
@@ -759,7 +759,9 @@ all.  This may very well take some time.")
   (when (nndiary-schedule)
     (let (result)
       (when nnmail-cache-accepted-message-ids
-       (nnmail-cache-insert (nnmail-fetch-field "message-id")))
+       (nnmail-cache-insert (nnmail-fetch-field "message-id") 
+                            group
+                            (nnmail-fetch-field "subject")))
       (if (stringp group)
          (and
           (nnmail-activate 'nndiary)
@@ -1123,13 +1125,7 @@ all.  This may very well take some time.")
        (narrow-to-region
         (goto-char (point-min))
         (if (search-forward "\n\n" nil t) (1- (point)) (point-max))))
-      ;; Fold continuation lines.
-      (goto-char (point-min))
-      (while (re-search-forward "\\(\r?\n[ \t]+\\)+" nil t)
-       (replace-match " " t t))
-      ;; Remove any tabs; they are too confusing.
-      (subst-char-in-region (point-min) (point-max) ?\t ? )
-      (let ((headers (nnheader-parse-head t)))
+      (let ((headers (nnheader-parse-naked-head)))
        (mail-header-set-chars headers chars)
        (mail-header-set-number headers number)
        headers))))
@@ -1416,7 +1412,7 @@ all.  This may very well take some time.")
                      (nth 6 date-elts))))
         reminder res)
     ;; remove the DOW and DST entries
-    (setf (nthcdr 6 date-elts) (nthcdr 8 date-elts))
+    (setcdr (nthcdr 5 date-elts) (nthcdr 8 date-elts))
     (while (setq reminder (pop reminders))
       (push
        (cond ((eq (cdr reminder) 'minute)