-;;; 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-2016 Free Software Foundation, Inc.
-;; Author: Kai Großjohann <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+;; 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
+;; 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.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
-;; This file is distributed in the hope that it will be useful,
+;; 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 <http://www.gnu.org/licenses/>.
;;; Commentary:
;;; 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?
(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"
(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)
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)
+ ;; Allow spell checking etc.
+ (run-hooks 'message-send-hook)
+ (let (num unit year month day hour minute deadline)
(cond ((string-match
"\\([0-9][0-9][0-9]?[0-9]?\\)-\\([0-9]+\\)-\\([0-9]+\\)"
delay)
(setq hour (string-to-number (match-string 1 delay))
minute (string-to-number (match-string 2 delay)))
;; Use current time, except...
- (setq deadline (apply 'vector (decode-time (current-time))))
+ (setq deadline (apply 'vector (decode-time)))
;; ... for minute and hour.
(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))))
(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)
- (nndraft-request-create-group gnus-delay-group)
+ ;; If group does not exist, create it.
+ (gnus-agent-queue-setup gnus-delay-group)
(message-disassociate-draft)
(nndraft-request-associate-buffer gnus-delay-group)
(save-buffer 0)
(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)) t)
(setq articles (nndraft-articles))
(while (setq article (pop articles))
(gnus-request-head article group)
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: utf-8
+;; End:
+
;;; gnus-delay.el ends here
projects / gnus / blobdiff