X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;ds=sidebyside;f=lisp%2Fgnus-delay.el;h=424f2c09e598176e14f38a4ab76a67ce827bb042;hb=91bfdfbc3e77a244efc8af47a47b30b10f48ec87;hp=74f6fb1dadd7adb10db82a8f187d91ca7ccdadcc;hpb=af7e32d986ae9fd406dec0494baa67ccd1efad82;p=gnus diff --git a/lisp/gnus-delay.el b/lisp/gnus-delay.el index 74f6fb1da..424f2c09e 100644 --- a/lisp/gnus-delay.el +++ b/lisp/gnus-delay.el @@ -1,24 +1,24 @@ ;;; gnus-delay.el --- Delayed posting of articles -;; Copyright (C) 2001 Free Software Foundation, Inc. +;; Copyright (C) 2001-2015 Free Software Foundation, Inc. -;; Author: Kai Großjohann +;; Author: Kai Großjohann ;; 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 . ;;; Commentary: @@ -26,7 +26,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? @@ -35,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" @@ -58,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) @@ -76,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]+\\)" @@ -94,16 +98,16 @@ DELAY is a string, giving the length of the time. Possible values are: (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)))) @@ -125,12 +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) - (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) @@ -138,15 +142,18 @@ 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)) t) (setq articles (nndraft-articles)) (while (setq article (pop articles)) (gnus-request-head article group) @@ -176,13 +183,12 @@ 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 -;; buffer-file-coding-system: iso-8859-1 +;; coding: utf-8 ;; End: ;;; gnus-delay.el ends here