Merge from emacs--rel--22

Patches applied:

 * emacs--rel--22  (patch 9-10)

   - Update from CVS

2007-05-06  Richard M. Stallman  <rms@gnu.org>

   * lisp/emacs-lisp/eldoc.el (turn-on-eldoc-mode): Doc fix.

2007-05-03  Ryan Yeske  <rcyeske@gmail.com>

   * lisp/net/rcirc.el (rcirc-timeout-seconds): Increase to prevent unwanted
   disconnections.

2007-05-06  Richard M. Stallman  <rms@gnu.org>

   * lispref/processes.texi (Accepting Output): Revert most of previous change.

2007-05-05  Richard M. Stallman  <rms@gnu.org>

   * lispref/processes.texi (Accepting Output): accept-process-output
   uses microseconds, not milliseconds.  But that arg is obsolete.

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

3 files changed, 11 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a6680ef9afa..363d2510ded 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2007-05-06  Richard Stallman  <rms@gnu.org>
+
+        * emacs-lisp/eldoc.el (turn-on-eldoc-mode): Doc fix.
+
 2007-05-05  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * diff.el (diff): Use buffer-local vars diff-old-file and diff-new-file
@@ -21,6 +25,11 @@
         was geometric).  All uses changed.
         (timeclock-generate-report): Support prefix argument.
 
+2007-05-03  Ryan Yeske  <rcyeske@gmail.com>
+
+        * net/rcirc.el (rcirc-timeout-seconds): Increase to prevent unwanted
+        disconnections.
+
 2007-05-01  Romain Francoise  <romain@orebokech.com>
 
         * dired-x.el: Revert 2007-04-06 change.
diff --git a/lisp/emacs-lisp/eldoc.el b/lisp/emacs-lisp/eldoc.el
index fd762e2968f..85b150b6ae5 100644
--- a/lisp/emacs-lisp/eldoc.el
+++ b/lisp/emacs-lisp/eldoc.el
@@ -157,7 +157,7 @@ With prefix ARG, turn ElDoc mode on if and only if ARG is positive."
 
 ;;;###autoload
 (defun turn-on-eldoc-mode ()
-  "Unequivocally turn on eldoc-mode (see variable documentation)."
+  "Unequivocally turn on ElDoc mode (see command `eldoc-mode')."
   (interactive)
   (eldoc-mode 1))
 
diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index dc346695ce2..311c052fa30 100644
--- a/lisp/net/rcirc.el
+++ b/lisp/net/rcirc.el
@@ -312,7 +312,7 @@ and the cdr part is used for encoding."
   "List of urls seen in the current buffer.")
 (put 'rcirc-urls 'permanent-local t)
 
-(defvar rcirc-timeout-seconds 60
+(defvar rcirc-timeout-seconds 600
   "Kill connection after this many seconds if there is no activity.")
 
 (defconst rcirc-id-string (concat "rcirc on GNU Emacs " emacs-version))