projects
/
elisp
/
gnus.git-
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit was generated by cvs2svn to compensate for changes in r3558,
[elisp/gnus.git-]
/
lisp
/
gnus-demon.el
diff --git
a/lisp/gnus-demon.el
b/lisp/gnus-demon.el
index
178cb66
..
0015a90
100644
(file)
--- a/
lisp/gnus-demon.el
+++ b/
lisp/gnus-demon.el
@@
-1,5
+1,5
@@
;;; gnus-demon.el --- daemonic Gnus behaviour
;;; gnus-demon.el --- daemonic Gnus behaviour
-;; Copyright (C) 1995,96,97,98,99 Free Software Foundation, Inc.
+;; Copyright (C) 1995,96,97,98 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Keywords: news
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Keywords: news
@@
-82,6
+82,10
@@
time Emacs has been idle for IDLE `gnus-demon-timestep's."
(defvar gnus-inhibit-demon nil
"*If non-nil, no daemonic function will be run.")
(defvar gnus-inhibit-demon nil
"*If non-nil, no daemonic function will be run.")
+(eval-and-compile
+ (autoload 'timezone-parse-date "timezone")
+ (autoload 'timezone-make-arpa-date "timezone"))
+
;;; Functions.
(defun gnus-demon-add-handler (function time idle)
;;; Functions.
(defun gnus-demon-add-handler (function time idle)
@@
-115,7
+119,8
@@
time Emacs has been idle for IDLE `gnus-demon-timestep's."
(nth 2 handler)))
gnus-demon-handlers))
(setq gnus-demon-idle-time 0)
(nth 2 handler)))
gnus-demon-handlers))
(setq gnus-demon-idle-time 0)
- (setq gnus-demon-idle-has-been-called nil)))
+ (setq gnus-demon-idle-has-been-called nil)
+ (setq gnus-use-demon t)))
(gnus-add-shutdown 'gnus-demon-cancel 'gnus)
(gnus-add-shutdown 'gnus-demon-cancel 'gnus)
@@
-125,6
+130,7
@@
time Emacs has been idle for IDLE `gnus-demon-timestep's."
(when gnus-demon-timer
(nnheader-cancel-timer gnus-demon-timer))
(setq gnus-demon-timer nil
(when gnus-demon-timer
(nnheader-cancel-timer gnus-demon-timer))
(setq gnus-demon-timer nil
+ gnus-use-demon nil
gnus-demon-idle-has-been-called nil)
(condition-case ()
(nnheader-cancel-function-timers 'gnus-demon)
gnus-demon-idle-has-been-called nil)
(condition-case ()
(nnheader-cancel-function-timers 'gnus-demon)
@@
-149,9
+155,9
@@
time Emacs has been idle for IDLE `gnus-demon-timestep's."
time
(let* ((now (current-time))
;; obtain NOW as discrete components -- make a vector for speed
time
(let* ((now (current-time))
;; obtain NOW as discrete components -- make a vector for speed
- (nowParts (decode-time now))
+ (nowParts (apply 'vector (decode-time now)))
;; obtain THEN as discrete components
;; obtain THEN as discrete components
- (thenParts (parse-time-string time))
+ (thenParts (timezone-parse-time time))
(thenHour (string-to-int (elt thenParts 0)))
(thenMin (string-to-int (elt thenParts 1)))
;; convert time as elements into number of seconds since EPOCH.
(thenHour (string-to-int (elt thenParts 0)))
(thenMin (string-to-int (elt thenParts 1)))
;; convert time as elements into number of seconds since EPOCH.
@@
-262,7
+268,8
@@
minutes, the connection is closed."
(defun gnus-demon-nntp-close-connection ()
(save-window-excursion
(defun gnus-demon-nntp-close-connection ()
(save-window-excursion
- (when (time-less-p '(0 300) (time-since nntp-last-command-time))
+ (when (nnmail-time-less '(0 300)
+ (nnmail-time-since nntp-last-command-time))
(nntp-close-server))))
(defun gnus-demon-add-scanmail ()
(nntp-close-server))))
(defun gnus-demon-add-scanmail ()