projects
/
gnus
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
imap.el: Remove an optional buffer parameter from many functions.
[gnus]
/
lisp
/
gnus-delay.el
diff --git
a/lisp/gnus-delay.el
b/lisp/gnus-delay.el
index
96f97ff
..
05bbaf5
100644
(file)
--- a/
lisp/gnus-delay.el
+++ b/
lisp/gnus-delay.el
@@
-1,26
+1,25
@@
;;; 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, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+;; 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., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
;;; Commentary:
@@
-37,11
+36,11
@@
(require 'nndraft)
(require 'gnus-draft)
(require 'nndraft)
(require 'gnus-draft)
+(autoload 'parse-time-string "parse-time" nil nil)
-;;;###autoload
(defgroup gnus-delay nil
"Arrange for sending postings later."
(defgroup gnus-delay nil
"Arrange for sending postings later."
- :version "2
1.4
"
+ :version "2
2.1
"
:group 'gnus)
(defcustom gnus-delay-group "delayed"
:group 'gnus)
(defcustom gnus-delay-group "delayed"
@@
-61,7
+60,7
@@
(defcustom gnus-delay-default-hour 8
"*If deadline is given as date, then assume this time of day."
(defcustom gnus-delay-default-hour 8
"*If deadline is given as date, then assume this time of day."
- :version "2
1.4
"
+ :version "2
2.1
"
:type 'integer
:group 'gnus-delay)
:type 'integer
:group 'gnus-delay)
@@
-103,10
+102,10
@@
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)
))
+ (when (< deadline (
gnus-float-time
))
(setq deadline (+ 3600 deadline))) ;3600 secs/day
;; Convert seconds to date header.
(setq deadline (message-make-date
(setq deadline (+ 3600 deadline))) ;3600 secs/day
;; Convert seconds to date header.
(setq deadline (message-make-date
@@
-129,8
+128,7
@@
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)
(t (error "Malformed delay `%s'" delay)))
(message-add-header (format "%s: %s" gnus-delay-header deadline)))
(set-buffer-modified-p t)
@@
-194,5
+192,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