summaryrefslogtreecommitdiff
path: root/lisp/gnus/gnus-demon.el
diff options
context:
space:
mode:
authorGnus developers <ding@gnus.org>2011-02-25 12:53:00 +0000
committerKatsumi Yamaoka <yamaoka@jpl.org>2011-02-25 12:53:00 +0000
commit0444b0a5ebdebcf64e3824c080a12e08fbbae956 (patch)
tree25477a91e0270bc33cdf02839022ff77035f59c8 /lisp/gnus/gnus-demon.el
parentcd4970c0529108c0506aefa94642cb839ef9e685 (diff)
downloademacs-0444b0a5ebdebcf64e3824c080a12e08fbbae956.tar.gz
Merge changes made in Gnus trunk.
auth-source.el (auth-source-save-behavior): New variable to replace `auth-source-never-create'. (auth-source-netrc-create): Use it. (auth-source-never-save): Remove. nnimap.el (nnimap-stream): Doc fix. (nnimap-open-connection-1): Reverse the order of the ports to that the prompted-for port is first. gnus-start.el (gnus-get-unread-articles): Don't clobber the async retrieval by the no-group selection. gnus-demon.el (gnus-demon-init): run-with-timer should be called with numerical parameters. auth-source.el (auth-source-creation-prompts): New variable to manage creation-time prompts. (auth-source-search): Document it. (auth-source-format-prompt): Add utility function. (auth-source-netrc-create): Don't default the user name to user-login-name. Use `auth-source-creation-prompts' and some default prompts for user, host, port, and password (the default generic prompt remains ugly). (auth-source-never-save): Add customizable option to never save info. (auth-source-netrc-create): Use it and improve save prompts. Fix help mode excursion.
Diffstat (limited to 'lisp/gnus/gnus-demon.el')
-rw-r--r--lisp/gnus/gnus-demon.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/gnus/gnus-demon.el b/lisp/gnus/gnus-demon.el
index 2a45b9363f4..419346b7191 100644
--- a/lisp/gnus/gnus-demon.el
+++ b/lisp/gnus/gnus-demon.el
@@ -140,7 +140,7 @@ Emacs has been idle for IDLE `gnus-demon-timestep's."
;; (func number nil)
;; Call every `time'
((and (numberp time) (null idle))
- (run-with-timer t time 'gnus-demon-run-callback func)))))
+ (run-with-timer time time 'gnus-demon-run-callback func)))))
(when timer
(add-to-list 'gnus-demon-timers timer)))))