Synch with Oort Gnus.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2d101e7..1474f22 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2001-08-14  Kai Gro\e,A_\e(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+
+       * gnus-delay.el (gnus-delay-send-drafts): Fix check whether
+       deadline has expired.
+
 2001-08-12  Simon Josefsson  <jas@extundo.com>
        Suggested by Kai.Grossjohann@CS.Uni-Dortmund.DE
 

diff --git a/lisp/gnus-delay.el b/lisp/gnus-delay.el
index faee7b4..92c0e2f 100644 (file)
--- a/lisp/gnus-delay.el
+++ b/lisp/gnus-delay.el
@@ -101,9 +101,10 @@ DELAY is a string, giving the length of the time.  Possible values are:
   (interactive)
   (save-excursion
     (let* ((group (format "nndraft:%s" gnus-delay-group))
-          (articles (nndraft-articles))
+          articles
           article deadline)
       (gnus-activate-group group)
+      (setq articles (nndraft-articles))
       (while (setq article (pop articles))
        (gnus-request-head article group)
        (set-buffer nntp-server-buffer)
@@ -115,12 +116,11 @@ DELAY is a string, giving the length of the time.  Possible values are:
              (setq deadline (nnheader-header-value))
              (setq deadline (apply 'encode-time (parse-time-string deadline)))
              (setq deadline (time-since deadline))
-             (when (time-less-p (apply 'encode-time
-                                       (parse-time-string deadline))
-                                (current-time))
-               (message "Sending article %d" article)
+             (when (and (>= (nth 0 deadline) 0)
+                        (>= (nth 1 deadline) 0))
+               (message "Sending delayed article %d" article)
                (gnus-draft-send article group)
-               (message "Sending article %d...done" article)))
+               (message "Sending delayed article %d...done" article)))
          (message "Delay header missing for article %d" article))))))
 
 ;;;###autoload