diff options
| author | Miles Bader <miles@gnu.org> | 2005-05-20 04:22:05 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2005-05-20 04:22:05 +0000 |
| commit | 64e9342958694825be1664890dcd22fffcd50d3a (patch) | |
| tree | a43e1796f5a49ae7eeec671447d10ac3731a1834 /lisp/emacs-lisp/eldoc.el | |
| parent | 5447510256e5a1b371407b751ddcc461044da5df (diff) | |
| parent | a18ff9886771c41186eebf8d7984fee2120dbe36 (diff) | |
| download | emacs-64e9342958694825be1664890dcd22fffcd50d3a.tar.gz emacs-64e9342958694825be1664890dcd22fffcd50d3a.tar.bz2 emacs-64e9342958694825be1664890dcd22fffcd50d3a.zip | |
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-53
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 302-319)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 69)
- Update from CVS
Diffstat (limited to 'lisp/emacs-lisp/eldoc.el')
| -rw-r--r-- | lisp/emacs-lisp/eldoc.el | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lisp/emacs-lisp/eldoc.el b/lisp/emacs-lisp/eldoc.el index b23217151e3..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 @@ -229,6 +229,7 @@ With prefix ARG, turn ElDoc mode on if and only if ARG is positive." (not (eq (selected-window) (minibuffer-window))))) +;;;###autoload (defvar eldoc-documentation-function nil "If non-nil, function to call to return doc string. The function of no args should return a one-line string for displaying |