diff options
| author | Miles Bader <miles@gnu.org> | 2007-05-07 01:09:35 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-05-07 01:09:35 +0000 |
| commit | 589e28cdeb6ed3759c13ceab8412ff9a3ac2f809 (patch) | |
| tree | 321cebe8a72f1ff4b19826d3a1aa72f7b85dc86d /lisp/emacs-lisp | |
| parent | 2f7ab554c1e479f6a57412119c73dc2fe73e4d18 (diff) | |
| parent | 205f01b40431f9295febfdffb576fd3c0a58f147 (diff) | |
| download | emacs-589e28cdeb6ed3759c13ceab8412ff9a3ac2f809.tar.gz emacs-589e28cdeb6ed3759c13ceab8412ff9a3ac2f809.tar.bz2 emacs-589e28cdeb6ed3759c13ceab8412ff9a3ac2f809.zip | |
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
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/eldoc.el | 2 |
1 files changed, 1 insertions, 1 deletions
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)) |