projects
/
elisp
/
gnus.git-
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Sync up with pgnus-0.16
[elisp/gnus.git-]
/
lisp
/
gnus-nocem.el
diff --git
a/lisp/gnus-nocem.el
b/lisp/gnus-nocem.el
index
66974ee
..
7535a25
100644
(file)
--- a/
lisp/gnus-nocem.el
+++ b/
lisp/gnus-nocem.el
@@
-190,9
+190,9
@@
matches an previously scanned and verified nocem message."
(let ((date (mail-header-date header))
issuer b e type)
(when (or (not date)
(let ((date (mail-header-date header))
issuer b e type)
(when (or (not date)
- (nnmail-time-less
- (nnmail-time-since (nnmail-date-to-time date))
- (nnmail-days-to-time gnus-nocem-expiry-wait)))
+ (time-less-p
+ (time-since (date-to-time date))
+ (days-to-time gnus-nocem-expiry-wait)))
(gnus-request-article-this-buffer (mail-header-number header) group)
(goto-char (point-min))
(when (re-search-forward "-----BEGIN PGP MESSAGE-----" nil t)
(gnus-request-article-this-buffer (mail-header-number header) group)
(goto-char (point-min))
(when (re-search-forward "-----BEGIN PGP MESSAGE-----" nil t)
@@
-316,11
+316,11
@@
matches an previously scanned and verified nocem message."
(let* ((alist gnus-nocem-alist)
(pprev (cons nil alist))
(prev pprev)
(let* ((alist gnus-nocem-alist)
(pprev (cons nil alist))
(prev pprev)
- (expiry (nnmail-days-to-time gnus-nocem-expiry-wait))
+ (expiry (days-to-time gnus-nocem-expiry-wait))
entry)
(setq gnus-nocem-hashtb (gnus-make-hashtable (* (length alist) 51)))
(while (setq entry (car alist))
entry)
(setq gnus-nocem-hashtb (gnus-make-hashtable (* (length alist) 51)))
(while (setq entry (car alist))
- (if (not (nnmail-time-less (nnmail-time-since (car entry)) expiry))
+ (if (not (time-less-p (time-since (car entry)) expiry))
;; This entry has expired, so we remove it.
(setcdr prev (cdr alist))
(setq prev alist)
;; This entry has expired, so we remove it.
(setcdr prev (cdr alist))
(setq prev alist)