X-Git-Url: https://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Fgnus-delay.el;h=02335e844f6b5fb12232f08c48886ffaaefc8aef;hb=e405b22c6b46721607c5e6c712a4705c23dee751;hp=449f9cb2fc8fcddc09736fc9a91c1fb7f6645e29;hpb=741a6a0e2888311a3683ee1bd43815e36feb1863;p=gnus

diff --git a/lisp/gnus-delay.el b/lisp/gnus-delay.el
index 449f9cb2f..02335e844 100644
--- a/lisp/gnus-delay.el
+++ b/lisp/gnus-delay.el
@@ -1,19 +1,21 @@
-;;; gnus-delay.el --- Delayed posting of articles -*- coding: latin-1; -*-
+;;; gnus-delay.el --- Delayed posting of articles
 
-;; Copyright (C) 2001  Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2002, 2003  Free Software Foundation, Inc.
 
 ;; Author: Kai Großjohann <Kai.Grossjohann@CS.Uni-Dortmund.DE>
 ;; Keywords: mail, news, extensions
 
-;; This file 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, or (at your option)
-;; any later version.
+;; This file is part of GNU Emacs.
 
-;; This file 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.
+;; 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, or (at your
+;; option) any later version.
+
+;; 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.
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
@@ -26,7 +28,7 @@
 
 ;;; Todo:
 
-;; * `gnus-delay-send-drafts' barfs when group does not exist.
+;; * `gnus-delay-send-queue' barfs when group does not exist.
 ;; * Integrate gnus-delay.el into the rest of Gnus automatically.  How
 ;;   should this be done?  Basically, we need to do what
 ;;   `gnus-delay-initialize' does.  But in which files?
@@ -39,6 +41,7 @@
 ;;;###autoload
 (defgroup gnus-delay nil
   "Arrange for sending postings later."
+  :version "22.1"
   :group 'gnus)
 
 (defcustom gnus-delay-group "delayed"
@@ -58,6 +61,7 @@
 
 (defcustom gnus-delay-default-hour 8
   "*If deadline is given as date, then assume this time of day."
+  :version "22.1"
   :type 'integer
   :group 'gnus-delay)
 
@@ -130,7 +134,9 @@ DELAY is a string, giving the length of the time.  Possible values are:
 	  (t (error "Malformed delay `%s'" delay)))
     (message-add-header (format "%s: %s" gnus-delay-header deadline)))
   (set-buffer-modified-p t)
-  (nndraft-request-create-group gnus-delay-group)
+  ;; If group does not exist, create it.
+  (let ((group (format "nndraft:%s" gnus-delay-group)))
+    (gnus-agent-queue-setup gnus-delay-group))
   (message-disassociate-draft)
   (nndraft-request-associate-buffer gnus-delay-group)
   (save-buffer 0)
@@ -138,15 +144,19 @@ DELAY is a string, giving the length of the time.  Possible values are:
   (message-do-actions message-postpone-actions))
 
 ;;;###autoload
-(defun gnus-delay-send-drafts ()
+(defun gnus-delay-send-queue ()
   "Send all the delayed messages that are due now."
   (interactive)
   (save-excursion
     (let* ((group (format "nndraft:%s" gnus-delay-group))
+	   (message-send-hook (copy-sequence message-send-hook))
 	   articles
 	   article deadline)
-      (when (gnus-gethash group gnus-newsrc-hashtb)
+      (when (gnus-group-entry group)
 	(gnus-activate-group group)
+	(add-hook 'message-send-hook
+		  '(lambda ()
+		     (message-remove-header gnus-delay-header)))
 	(setq articles (nndraft-articles))
 	(while (setq article (pop articles))
 	  (gnus-request-head article group)
@@ -176,7 +186,13 @@ This tells Gnus to look for delayed messages after getting new news.
 The optional arg NO-KEYMAP is ignored.
 Checking delayed messages is skipped if optional arg NO-CHECK is non-nil."
   (unless no-check
-    (add-hook 'gnus-get-new-news-hook 'gnus-delay-send-drafts)))
+    (add-hook 'gnus-get-new-news-hook 'gnus-delay-send-queue)))
 
 (provide 'gnus-delay)
+
+;; Local Variables:
+;; coding: iso-8859-1
+;; End:
+
+;;; arch-tag: fb2ad634-a897-4142-a503-f5991ec2349d
 ;;; gnus-delay.el ends here