Synch with Oort Gnus.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index caf64ff..9ff6eaa 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2001-07-26  Kai Gro\e,A_\e(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+
+       * gnus-delay.el (gnus-delay-send-drafts): Don't `error'.
+
 2001-07-25 21:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * gnus-bcklg.el (gnus-backlog-shutdown): Make interactive.

diff --git a/lisp/gnus-delay.el b/lisp/gnus-delay.el
index d8f4fd8..5d6eb44 100644 (file)
--- a/lisp/gnus-delay.el
+++ b/lisp/gnus-delay.el
@@ -107,17 +107,20 @@ DELAY is a string, giving the length of the time.  Possible values are:
       (while (setq article (pop articles))
        (gnus-request-head article group)
        (set-buffer nntp-server-buffer)
-       (unless (re-search-forward
-                (concat "^" (regexp-quote gnus-delay-header) ":\\s-+"))
-         (error "Couldn't find delay for article %d" article))
-       (setq deadline (nnheader-header-value))
-       (setq deadline (apply 'encode-time (parse-time-string deadline)))
-       (setq deadline (time-since deadline))
-       (when (and (>= (nth 0 deadline) 0)
-                  (>= (nth 1 deadline) 0))
-         (message "Sending article %d" article)
-         (gnus-draft-send article group)
-         (message "Sending article %d...done" article))))))
+       (goto-char (point-min))
+       (if (re-search-forward
+            (concat "^" (regexp-quote gnus-delay-header) ":\\s-+")
+            nil t)
+           (progn
+             (setq deadline (nnheader-header-value))
+             (setq deadline (apply 'encode-time (parse-time-string deadline)))
+             (setq deadline (time-since deadline))
+             (when (and (>= (nth 0 deadline) 0)
+                        (>= (nth 1 deadline) 0))
+               (message "Sending article %d" article)
+               (gnus-draft-send article group)
+               (message "Sending article %d...done" article)))
+         (message "Delay header missing for article %d" article))))))
 
 ;;;###autoload
 (defun gnus-delay-initialize (&optional no-keymap no-check)