projects
/
gnus
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(auth-source-netrc-parse): Accept a number as the port spec, too.
[gnus]
/
lisp
/
gnus-delay.el
diff --git
a/lisp/gnus-delay.el
b/lisp/gnus-delay.el
index
c316bbd
..
bfd1705
100644
(file)
--- a/
lisp/gnus-delay.el
+++ b/
lisp/gnus-delay.el
@@
-1,26
+1,24
@@
;;; gnus-delay.el --- Delayed posting of articles
;;; gnus-delay.el --- Delayed posting of articles
-;; Copyright (C) 2001
, 2002, 2003
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
;; This file is part of GNU Emacs.
;; Author: Kai Großjohann <Kai.Grossjohann@CS.Uni-Dortmund.DE>
;; 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 you
r
-;; 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, o
r
+;;
(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
+;; G
NU G
eneral Public License for more details.
;; You should have received a copy of the GNU General Public License
;; 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., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
;;; Commentary:
@@
-39,7
+37,6
@@
(require 'gnus-draft)
(autoload 'parse-time-string "parse-time" nil nil)
(require 'gnus-draft)
(autoload 'parse-time-string "parse-time" nil nil)
-;;;###autoload
(defgroup gnus-delay nil
"Arrange for sending postings later."
:version "22.1"
(defgroup gnus-delay nil
"Arrange for sending postings later."
:version "22.1"
@@
-81,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
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
gnus-delay-default-delay)))
(let (num unit days year month day hour minute deadline)
(cond ((string-match
@@
-104,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.
(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.
(append deadline nil))))
;; If this time has passed already, add a day.
- (when (< deadline (
time-to-seconds (current-time)
))
- (setq deadline (+
3600 deadline))) ;36
00 secs/day
+ (when (< deadline (
gnus-float-time
))
+ (setq deadline (+
86400 deadline))) ; 864
00 secs/day
;; Convert seconds to date header.
(setq deadline (message-make-date
(seconds-to-time deadline))))
;; Convert seconds to date header.
(setq deadline (message-make-date
(seconds-to-time deadline))))
@@
-130,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
(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.
(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)
(message-disassociate-draft)
(nndraft-request-associate-buffer gnus-delay-group)
(save-buffer 0)
@@
-195,5
+190,4
@@
Checking delayed messages is skipped if optional arg NO-CHECK is non-nil."
;; coding: iso-8859-1
;; End:
;; coding: iso-8859-1
;; End:
-;;; arch-tag: fb2ad634-a897-4142-a503-f5991ec2349d
;;; gnus-delay.el ends here
;;; gnus-delay.el ends here