X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Fgnus-delay.el;h=2cdafe1565b25230de0d1a1a8acefb869665bb37;hb=70219a78f539a29fc94c8a3591db58f1386099de;hp=4024a00443f19d4ecbe073028f76b4207ce93037;hpb=4e6ed4bd8e175ab78acf62b8f5e9a8af0e703992;p=gnus diff --git a/lisp/gnus-delay.el b/lisp/gnus-delay.el index 4024a0044..2cdafe156 100644 --- a/lisp/gnus-delay.el +++ b/lisp/gnus-delay.el @@ -1,26 +1,24 @@ ;;; gnus-delay.el --- Delayed posting of articles -;; Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. +;; Copyright (C) 2001-2013 Free Software Foundation, Inc. -;; Author: Kai Großjohann +;; Author: Kai Großjohann ;; Keywords: mail, news, extensions ;; This file is part of GNU Emacs. -;; 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 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 3 of the License, 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. +;; 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 -;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; along with GNU Emacs. If not, see . ;;; Commentary: @@ -37,10 +35,11 @@ (require 'nndraft) (require 'gnus-draft) +(autoload 'parse-time-string "parse-time" nil nil) -;;;###autoload (defgroup gnus-delay nil "Arrange for sending postings later." + :version "22.1" :group 'gnus) (defcustom gnus-delay-group "delayed" @@ -60,6 +59,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) @@ -78,8 +78,10 @@ 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))) + ;; Allow spell checking etc. + (run-hooks 'message-send-hook) (let (num unit days year month day hour minute deadline) (cond ((string-match "\\([0-9][0-9][0-9]?[0-9]?\\)-\\([0-9]+\\)-\\([0-9]+\\)" @@ -101,11 +103,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,17 +129,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))) - (unless (gnus-gethash group gnus-newsrc-hashtb) - (nndraft-request-create-group gnus-delay-group) - ;; Make it active. - (gnus-set-active group (cons 1 0)))) + (gnus-agent-queue-setup gnus-delay-group) (message-disassociate-draft) (nndraft-request-associate-buffer gnus-delay-group) (save-buffer 0) @@ -153,11 +150,10 @@ DELAY is a string, giving the length of the time. Possible values are: (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))) + (lambda () (message-remove-header gnus-delay-header))) (setq articles (nndraft-articles)) (while (setq article (pop articles)) (gnus-request-head article group) @@ -192,7 +188,7 @@ Checking delayed messages is skipped if optional arg NO-CHECK is non-nil." (provide 'gnus-delay) ;; Local Variables: -;; coding: iso-8859-1 +;; coding: utf-8 ;; End: ;;; gnus-delay.el ends here