X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/ac3232837188f7e1c4ffe34b76edede0ccb54f5e..a64bfdfa5a90731b804c057f2bcc74a8ba02937c:/lisp/gnus/gnus-delay.el

diff --git a/lisp/gnus/gnus-delay.el b/lisp/gnus/gnus-delay.el
index 80d9feaebf..c632cab422 100644
--- a/lisp/gnus/gnus-delay.el
+++ b/lisp/gnus/gnus-delay.el
@@ -1,6 +1,6 @@
 ;;; gnus-delay.el --- Delayed posting of articles
 
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;; Copyright (C) 2001-2011  Free Software Foundation, Inc.
 
 ;; Author: Kai Großjohann <Kai.Grossjohann@CS.Uni-Dortmund.DE>
 ;; Keywords: mail, news, extensions
@@ -78,7 +78,7 @@ DELAY is a string, giving the length of the time.  Possible values are:
   time, then the deadline is tomorrow, else today."
   (interactive
    (list (read-string
-	  "Target date (YYYY-MM-DD) or length of delay (units in [mhdwMY]): "
+	  "Target date (YYYY-MM-DD), time (hh:mm), or length of delay (units in [mhdwMY]): "
 	  gnus-delay-default-delay)))
   (let (num unit days year month day hour minute deadline)
     (cond ((string-match
@@ -101,11 +101,11 @@ DELAY is a string, giving the length of the time.  Possible values are:
 	   (aset deadline 1 minute)
 	   (aset deadline 2 hour)
 	   ;; Convert to seconds.
-	   (setq deadline (time-to-seconds (apply 'encode-time
+	   (setq deadline (gnus-float-time (apply 'encode-time
 						  (append deadline nil))))
 	   ;; If this time has passed already, add a day.
-	   (when (< deadline (time-to-seconds (current-time)))
-	     (setq deadline (+ 3600 deadline))) ;3600 secs/day
+	   (when (< deadline (gnus-float-time))
+	     (setq deadline (+ 86400 deadline))) ; 86400 secs/day
 	   ;; Convert seconds to date header.
 	   (setq deadline (message-make-date
 			   (seconds-to-time deadline))))
@@ -127,14 +127,12 @@ DELAY is a string, giving the length of the time.  Possible values are:
 		 (t
 		  (setq delay (* num 60))))
 	   (setq deadline (message-make-date
-			   (seconds-to-time (+ (time-to-seconds (current-time))
-					       delay)))))
+			   (seconds-to-time (+ (gnus-float-time) delay)))))
 	  (t (error "Malformed delay `%s'" delay)))
     (message-add-header (format "%s: %s" gnus-delay-header deadline)))
   (set-buffer-modified-p t)
   ;; If group does not exist, create it.
-  (let ((group (format "nndraft:%s" gnus-delay-group)))
-    (gnus-agent-queue-setup gnus-delay-group))
+  (gnus-agent-queue-setup gnus-delay-group)
   (message-disassociate-draft)
   (nndraft-request-associate-buffer gnus-delay-group)
   (save-buffer 0)
@@ -153,8 +151,7 @@ DELAY is a string, giving the length of the time.  Possible values are:
       (when (gnus-group-entry group)
 	(gnus-activate-group group)
 	(add-hook 'message-send-hook
-		  '(lambda ()
-		     (message-remove-header gnus-delay-header)))
+		  (lambda () (message-remove-header gnus-delay-header)))
 	(setq articles (nndraft-articles))
 	(while (setq article (pop articles))
 	  (gnus-request-head article group)
@@ -192,5 +189,4 @@ Checking delayed messages is skipped if optional arg NO-CHECK is non-nil."
 ;; coding: iso-8859-1
 ;; End:
 
-;; arch-tag: fb2ad634-a897-4142-a503-f5991ec2349d
 ;;; gnus-delay.el ends here