diff options
| author | Karoly Lorentey <lorentey@elte.hu> | 2005-05-20 17:44:36 +0000 |
|---|---|---|
| committer | Karoly Lorentey <lorentey@elte.hu> | 2005-05-20 17:44:36 +0000 |
| commit | b4bb3cbc7caca5c9c207d9ed42cacb978790af67 (patch) | |
| tree | 6d347dbb4b2db074171d0bbcb89afe851cffe85b /lisp/emacs-lisp/eldoc.el | |
| parent | 35bc5d82600f330082298823f09f53259a90ea81 (diff) | |
| parent | a18ff9886771c41186eebf8d7984fee2120dbe36 (diff) | |
| download | emacs-b4bb3cbc7caca5c9c207d9ed42cacb978790af67.tar.gz emacs-b4bb3cbc7caca5c9c207d9ed42cacb978790af67.tar.bz2 emacs-b4bb3cbc7caca5c9c207d9ed42cacb978790af67.zip | |
Merged from miles@gnu.org--gnu-2005 (patch 69, 313-319)
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-313
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-314
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-315
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-316
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-317
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-318
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-319
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-69
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-347
Diffstat (limited to 'lisp/emacs-lisp/eldoc.el')
| -rw-r--r-- | lisp/emacs-lisp/eldoc.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/emacs-lisp/eldoc.el b/lisp/emacs-lisp/eldoc.el index 1546d078aea..bf6b601ef7a 100644 --- a/lisp/emacs-lisp/eldoc.el +++ b/lisp/emacs-lisp/eldoc.el @@ -141,9 +141,9 @@ truncated to make more of the arglist or documentation string visible." "Toggle ElDoc mode on or off. In ElDoc mode, the echo area displays information about a function or variable in the text where point is. If point is -on a documented variable, it displays that variable's doc string. -Otherwise it displays the argument list of the function called -in the expression point is on. +on a documented variable, it displays the first line of that +variable's doc string. Otherwise it displays the argument list +of the function called in the expression point is on. With prefix ARG, turn ElDoc mode on if and only if ARG is positive." :group 'eldoc :lighter eldoc-minor-mode-string |