diff src/keyboard.c @ 83286:9deb6323655c

Merged from [e-mail]--gnu-2005 (patch 59, 240-245) Patches applied: * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-240 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-241 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-242 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-243 Merge from gnus--rel--5.10 * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-244 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-245 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-59 Update from CVS git-archimport-id: [e-mail]--2004/emacs--multi-tty--0--patch-326

--- a/src/keyboard.c	Fri Apr 08 16:25:22 2005 +0000
+++ b/src/keyboard.c	Mon Apr 11 12:40:15 2005 +0000
@@ -2252,12 +2252,16 @@
   return c;
 }
 
-/* Display help echo in the echo area.
-
-   HELP a string means display that string, HELP nil means clear the
-   help echo.  If HELP is a function, call it with OBJECT and POS as
-   arguments; the function should return a help string or nil for
-   none.  For all other types of HELP evaluate it to obtain a string.
+/* Display the help-echo property of the character after the mouse pointer.
+   Either show it in the echo area, or call show-help-function to display
+   it by other means (maybe in a tooltip).
+
+   If HELP is nil, that means clear the previous help echo.
+
+   If HELP is a string, display that string.  If HELP is a function,
+   call it with OBJECT and POS as arguments; the function should
+   return a help string or nil for none.  For all other types of HELP,
+   evaluate it to obtain a string.
 
    WINDOW is the window in which the help was generated, if any.
    It is nil if not in a window.