diff options
author | Miles Bader <[email protected]> | 2007-05-07 01:09:35 +0000 |
---|---|---|
committer | Miles Bader <[email protected]> | 2007-05-07 01:09:35 +0000 |
commit | 589e28cdeb6ed3759c13ceab8412ff9a3ac2f809 (patch) | |
tree | 321cebe8a72f1ff4b19826d3a1aa72f7b85dc86d | |
parent | 2f7ab554c1e479f6a57412119c73dc2fe73e4d18 (diff) | |
parent | 205f01b40431f9295febfdffb576fd3c0a58f147 (diff) |
Merge from emacs--rel--22
Patches applied:
* emacs--rel--22 (patch 9-10)
- Update from CVS
2007-05-06 Richard M. Stallman <[email protected]>
* lisp/emacs-lisp/eldoc.el (turn-on-eldoc-mode): Doc fix.
2007-05-03 Ryan Yeske <[email protected]>
* lisp/net/rcirc.el (rcirc-timeout-seconds): Increase to prevent unwanted
disconnections.
2007-05-06 Richard M. Stallman <[email protected]>
* lispref/processes.texi (Accepting Output): Revert most of previous change.
2007-05-05 Richard M. Stallman <[email protected]>
* lispref/processes.texi (Accepting Output): accept-process-output
uses microseconds, not milliseconds. But that arg is obsolete.
Revision: [email protected]/emacs--devo--0--patch-734
-rw-r--r-- | lisp/ChangeLog | 9 | ||||
-rw-r--r-- | lisp/emacs-lisp/eldoc.el | 2 | ||||
-rw-r--r-- | lisp/net/rcirc.el | 2 | ||||
-rw-r--r-- | lispref/ChangeLog | 9 | ||||
-rw-r--r-- | lispref/processes.texi | 12 |
5 files changed, 26 insertions, 8 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a6680ef9af..363d2510de 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2007-05-06 Richard Stallman <[email protected]> + + * emacs-lisp/eldoc.el (turn-on-eldoc-mode): Doc fix. + 2007-05-05 Stefan Monnier <[email protected]> * 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 <[email protected]> + + * net/rcirc.el (rcirc-timeout-seconds): Increase to prevent unwanted + disconnections. + 2007-05-01 Romain Francoise <[email protected]> * dired-x.el: Revert 2007-04-06 change. diff --git a/lisp/emacs-lisp/eldoc.el b/lisp/emacs-lisp/eldoc.el index fd762e2968..85b150b6ae 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 dc346695ce..311c052fa3 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)) diff --git a/lispref/ChangeLog b/lispref/ChangeLog index 5ebee61ecf..ba206646a4 100644 --- a/lispref/ChangeLog +++ b/lispref/ChangeLog @@ -1,3 +1,12 @@ +2007-05-06 Richard Stallman <[email protected]> + + * processes.texi (Accepting Output): Revert most of previous change. + +2007-05-05 Richard Stallman <[email protected]> + + * processes.texi (Accepting Output): accept-process-output + uses microseconds, not milliseconds. But that arg is obsolete. + 2007-05-04 Karl Berry <[email protected]> * elisp.texi (EMACSVER) [smallbook]: 22.1, not 22. diff --git a/lispref/processes.texi b/lispref/processes.texi index fbc8b785c1..81cac3e504 100644 --- a/lispref/processes.texi +++ b/lispref/processes.texi @@ -1307,13 +1307,13 @@ The arguments @var{seconds} and @var{millisec} let you specify timeout periods. The former specifies a period measured in seconds and the latter specifies one measured in milliseconds. The two time periods thus specified are added together, and @code{accept-process-output} -returns after that much time whether or not there has been any +returns after that much time, whether or not there has been any subprocess output. - -The argument @var{seconds} need not be an integer. If it is a floating -point number, this function waits for a fractional number of seconds. -If @var{seconds} is 0, the function accepts whatever output is -pending but does not wait. + +The argument @var{millisec} is semi-obsolete nowadays because +@var{seconds} can be a floating point number to specify waiting a +fractional number of seconds. If @var{seconds} is 0, the function +accepts whatever output is pending but does not wait. @c Emacs 22.1 feature If @var{process} is a process, and the argument @var{just-this-one} is |