comparison lisp/emacs-lisp/eldoc.el @ 83306:8b66fddd72c5

Merged from miles@gnu.org--gnu-2005 (patch 307-312) Patches applied: * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-307 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-308 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-309 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-310 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-311 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-312 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-346
author Karoly Lorentey <lorentey@elte.hu>
date Mon, 16 May 2005 15:49:27 +0000
parents effe22690419 6ee2b2667bce
children 21eea50897a7
comparison
equal deleted inserted replaced
83305:80cb3fe96145 83306:8b66fddd72c5
227 ;; interference with what's going on there. 227 ;; interference with what's going on there.
228 (not cursor-in-echo-area) 228 (not cursor-in-echo-area)
229 (not (eq (selected-window) (minibuffer-window))))) 229 (not (eq (selected-window) (minibuffer-window)))))
230 230
231 231
232 ;;;###autoload
232 (defvar eldoc-documentation-function nil 233 (defvar eldoc-documentation-function nil
233 "If non-nil, function to call to return doc string. 234 "If non-nil, function to call to return doc string.
234 The function of no args should return a one-line string for displaying 235 The function of no args should return a one-line string for displaying
235 doc about a function etc. appropriate to the context around point. 236 doc about a function etc. appropriate to the context around point.
236 It should return nil if there's no doc appropriate for the context. 237 It should return nil if there's no doc appropriate for the context.