projects
/
gnus
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Refactor mml-smime.el, mml1991.el, mml2015.el
[gnus]
/
lisp
/
gnus-delay.el
diff --git
a/lisp/gnus-delay.el
b/lisp/gnus-delay.el
index
1448031
..
93069e5
100644
(file)
--- a/
lisp/gnus-delay.el
+++ b/
lisp/gnus-delay.el
@@
-1,8
+1,8
@@
;;; gnus-delay.el --- Delayed posting of articles
;;; gnus-delay.el --- Delayed posting of articles
-;; Copyright (C) 2001
, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
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 part of GNU Emacs.
;; Keywords: mail, news, extensions
;; This file is part of GNU Emacs.
@@
-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
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)))
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]+\\)"
(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]+\\)"
@@
-96,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 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.
;; ... 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.
(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))))
@@
-127,14
+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
(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)
@@
-153,8
+153,7
@@
DELAY is a string, giving the length of the time. Possible values are:
(when (gnus-group-entry group)
(gnus-activate-group group)
(add-hook 'message-send-hook
(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)) t)
(setq articles (nndraft-articles))
(while (setq article (pop articles))
(gnus-request-head article group)
(setq articles (nndraft-articles))
(while (setq article (pop articles))
(gnus-request-head article group)
@@
-189,8
+188,7
@@
Checking delayed messages is skipped if optional arg NO-CHECK is non-nil."
(provide 'gnus-delay)
;; Local Variables:
(provide 'gnus-delay)
;; Local Variables:
-;; coding:
iso-8859-1
+;; coding:
utf-8
;; End:
;; End:
-;; arch-tag: fb2ad634-a897-4142-a503-f5991ec2349d
;;; gnus-delay.el ends here
;;; gnus-delay.el ends here