Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-24 13:57:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge from emacs--rel--22

Browse source 
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
This commit is contained in:
Miles Bader 2007-05-07 01:09:35 +00:00
commit 589e28cdeb
5 changed files with 26 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lisp/ChangeLog
View file

@ -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.

2
lisp/emacs-lisp/eldoc.el
View file

@ -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))

2
lisp/net/rcirc.el
View file

@ -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))

9
lispref/ChangeLog
View file

@ -1,3 +1,12 @@
2007-05-06 Richard Stallman <rms@gnu.org>
* processes.texi (Accepting Output): Revert most of previous change.
2007-05-05 Richard Stallman <rms@gnu.org>
* processes.texi (Accepting Output): accept-process-output
uses microseconds, not milliseconds. But that arg is obsolete.
2007-05-04 Karl Berry <karl@tug.org>
* elisp.texi (EMACSVER) [smallbook]: 22.1, not 22.

12
lispref/processes.texi
View file

@ -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