Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 1613, 1615-1616)

   - Update from CVS
   - Merge from gnus--devo--0

2009-07-24  Glenn Morris  <rgm@gnu.org>

   * lisp/gnus-demon.el (gnus-demon-add-nntp-close-connection):
   Fix typo.  (Bug#3903)

Revision: emacs@sv.gnu.org/gnus--devo--0--patch-596

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e3a5fb9..f3fce86 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-07-24  Glenn Morris  <rgm@gnu.org>
+
+       * gnus-demon.el (gnus-demon-add-nntp-close-connection):
+       Fix typo.  (Bug#3903)
+
 2009-07-23  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * gnus-art.el (gnus-article-mode-map): Bind the "e" key to

diff --git a/lisp/gnus-demon.el b/lisp/gnus-demon.el
index cc7aa11..e6b8a77 100644 (file)
--- a/lisp/gnus-demon.el
+++ b/lisp/gnus-demon.el
@@ -261,7 +261,7 @@ time Emacs has been idle for IDLE `gnus-demon-timestep's."
   "Add daemonic nntp server disconnection to Gnus.
 If no commands have gone out via nntp during the last five
 minutes, the connection is closed."
-  (gnus-demon-add-handler 'gnus-demon-nntp-close-connections 5 nil))
+  (gnus-demon-add-handler 'gnus-demon-nntp-close-connection 5 nil))
 
 (defun gnus-demon-nntp-close-connection ()
   (save-window-excursion