projects
/
gnus
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(article-date-ut): Fix end point of narrowing.
[gnus]
/
lisp
/
gnus-demon.el
diff --git
a/lisp/gnus-demon.el
b/lisp/gnus-demon.el
index
f584b2d
..
bf7b4db
100644
(file)
--- a/
lisp/gnus-demon.el
+++ b/
lisp/gnus-demon.el
@@
-1,17
+1,17
@@
-;;; gnus-demon.el --- daemonic Gnus behavio
u
r
+;;; gnus-demon.el --- daemonic Gnus behavior
-;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 200
3
-;;
Free Software Foundation, Inc.
+;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 200
1, 2002, 2003, 2004,
+;;
2005, 2006, 2007, 2008
Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Keywords: news
;; This file is part of GNU Emacs.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Keywords: news
;; This file is part of GNU Emacs.
-;; GNU Emacs is free software
;
you can redistribute it and/or modify
+;; 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
;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation
; either version 2, or (at your option)
-;; any later version.
+;; the Free Software Foundation
, either version 3 of the License, or
+;;
(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
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-19,9
+19,7
@@
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
;; GNU General Public License for more details.
;; 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:
@@
-35,13
+33,11
@@
(require 'nntp)
(require 'nnmail)
(require 'gnus-util)
(require 'nntp)
(require 'nnmail)
(require 'gnus-util)
-(eval-and-compile
- (if (featurep 'xemacs)
- (require 'itimer)
- (require 'timer)))
+
+(autoload 'parse-time-string "parse-time" nil nil)
(defgroup gnus-demon nil
(defgroup gnus-demon nil
- "Demonic behavio
u
r."
+ "Demonic behavior."
:group 'gnus)
(defcustom gnus-demon-handlers nil
:group 'gnus)
(defcustom gnus-demon-handlers nil
@@
-216,7
+212,7
@@
time Emacs has been idle for IDLE `gnus-demon-timestep's."
(< idle gnus-demon-idle-time)) ; Idle timed out.
(t (< 0 gnus-demon-idle-time)))) ; Or just need to be idle.
;; So we call the handler.
(< idle gnus-demon-idle-time)) ; Idle timed out.
(t (< 0 gnus-demon-idle-time)))) ; Or just need to be idle.
;; So we call the handler.
- (
progn
+ (
gnus-with-local-quit
(ignore-errors (funcall (car handler)))
;; And reset the timer.
(setcar (nthcdr 1 handler)
(ignore-errors (funcall (car handler)))
;; And reset the timer.
(setcar (nthcdr 1 handler)
@@
-230,14
+226,15
@@
time Emacs has been idle for IDLE `gnus-demon-timestep's."
(gnus-demon-is-idle-p))
;; We want to call this handler each and every time that
;; Emacs is idle.
(gnus-demon-is-idle-p))
;; We want to call this handler each and every time that
;; Emacs is idle.
- (ignore-errors (funcall (car handler))))
+ (gnus-with-local-quit
+ (ignore-errors (funcall (car handler)))))
(t
;; We want to call this handler only if Emacs has been idle
;; for a specified number of timesteps.
(and (not (memq (car handler) gnus-demon-idle-has-been-called))
(< idle gnus-demon-idle-time)
(gnus-demon-is-idle-p)
(t
;; We want to call this handler only if Emacs has been idle
;; for a specified number of timesteps.
(and (not (memq (car handler) gnus-demon-idle-has-been-called))
(< idle gnus-demon-idle-time)
(gnus-demon-is-idle-p)
- (
progn
+ (
gnus-with-local-quit
(ignore-errors (funcall (car handler)))
;; Make sure the handler won't be called once more in
;; this idle-cycle.
(ignore-errors (funcall (car handler)))
;; Make sure the handler won't be called once more in
;; this idle-cycle.
@@
-322,5
+319,5
@@
minutes, the connection is closed."
(provide 'gnus-demon)
(provide 'gnus-demon)
-;;
;
arch-tag: 8dd5cd3d-6ae4-46b4-9b15-f5fca09fd392
+;; arch-tag: 8dd5cd3d-6ae4-46b4-9b15-f5fca09fd392
;;; gnus-demon.el ends here
;;; gnus-demon.el ends here