* tooltip.el (tooltip-frame-parameters): Doc fix.

2 files changed, 12 insertions, 6 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index dc41231ec53..726872e880a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2008-10-31  Juanma Barranquero  <lekktu@gmail.com>
+
+        * tooltip.el (tooltip-frame-parameters): Doc fix.
+
 2008-10-31  Martin Rudalics  <rudalics@gmx.at>
 
         * window.el (window-body-height, window-current-scroll-bars)
@@ -15,11 +19,6 @@
         (split-window-save-restore-data): Rename args and use
         when instead of if.
 
-2008-10-29  Kenichi Handa  <handa@m17n.org>
-
-        * descr-text.el (describe-char): Fix terminal case (where font is
-        nil).
-
 2008-10-30  Chong Yidong  <cyd@stupidchicken.com>
 
         * indent.el (indent-for-tab-command): Use use-region-p.
@@ -141,6 +140,10 @@
         * startup.el (inhibit-startup-screen): Reflow docstring.
         (user-mail-address, tool-bar-images-pixel-height): Fix docstring typos.
 
+2008-10-27  Kenichi Handa  <handa@m17n.org>
+
+        * descr-text.el (describe-char): Fix terminal case (where font is nil).
+
 2008-10-27  Juanma Barranquero  <lekktu@gmail.com>
 
         * face-remap.el (text-scale-increase, text-scale-decrease)
diff --git a/lisp/tooltip.el b/lisp/tooltip.el
index fd3f3934824..cf1951bedb8 100644
--- a/lisp/tooltip.el
+++ b/lisp/tooltip.el
@@ -121,7 +121,10 @@ the value of `tooltip-y-offset' is ignored."
   "Frame parameters used for tooltips.
 
 If `left' or `top' parameters are included, they specify the absolute
-position to pop up the tooltip."
+position to pop up the tooltip.
+
+Note that font and color parameters are ignored, and the attributes
+of the `tooltip' face are used instead."
   :type 'sexp
   :group 'tooltip)