* nnmail.el (nnmail-cache-insert): make sure that the

[gnus] / lisp / nndiary.el

diff --git a/lisp/nndiary.el b/lisp/nndiary.el
index 4616805..51cbd9a 100644 (file)
--- a/lisp/nndiary.el
+++ b/lisp/nndiary.el
@@ -1,21 +1,21 @@
 ;;; nndiary.el --- A diary backend for Gnus
 
-;; Copyright (C) 1999-2001 Didier Verna.
+;; Copyright (C) 1999, 2000, 2001, 2003
+;;        Free Software Foundation, Inc.
 
 ;; Author:        Didier Verna <didier@xemacs.org>
 ;; Maintainer:    Didier Verna <didier@xemacs.org>
 ;; Created:       Fri Jul 16 18:55:42 1999
-;; Last Revision: Wed Aug  8 17:36:21 2001
 ;; Keywords:      calendar mail news
 
-;; This file is part of Gnus.
+;; This file is part of GNU Emacs.
 
-;; Gnus is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation; either version 2 of the License, or
 ;; (at your option) any later version.
 
-;; Gnus is distributed in the hope that it will be useful,
+;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;; GNU General Public License for more details.
@@ -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)