; Fix documentation about faces of tool-tip text

* lisp/tooltip.el (tooltip):
* src/frame.c (syms_of_frame) <use-system-tooltips>: Doc fixes.

diff --git a/lisp/tooltip.el b/lisp/tooltip.el
index a198a3d8d08d23cb98e429fca26b12496b0baa0b..482af3bd7bf961b690894a2689d430b66145f6be 100644 (file)
--- a/lisp/tooltip.el
+++ b/lisp/tooltip.el
@@ -135,8 +135,8 @@ of the `tooltip' face are used instead."
      :inherit variable-pitch))
   "Face for tooltips.
 
-When using the GTK toolkit, this face will only be used if
-`x-gtk-use-system-tooltips' is non-nil."
+When using the GTK toolkit, NS, or Haiku, this face will only
+be used if `use-system-tooltips' is nil."
   :group 'tooltip
   :group 'basic-faces)
 

diff --git a/src/frame.c b/src/frame.c
index 8753f168a3bb7cd0872cd8567170cd8398a5db28..b21ff73c9efe33bc0f823618757ee97103d07fb6 100644 (file)
--- a/src/frame.c
+++ b/src/frame.c
@@ -6795,11 +6795,11 @@ Gtk+ tooltips are not used) and on Windows.  */);
   tooltip_reuse_hidden_frame = false;
 
   DEFVAR_BOOL ("use-system-tooltips", use_system_tooltips,
-              doc: /* Use the toolkit to display tooltips.
-This option is only meaningful when Emacs is built with GTK+ or Haiku
-windowing support, and results in tooltips that look like those
-displayed by other GTK+ or Haiku programs, but will not be able to
-display text properties inside tooltip text.  */);
+              doc: /* Whether to use the toolkit to display tooltips.
+This option is only meaningful when Emacs is built with GTK+, NS or Haiku
+windowing support, and, if it's non-nil (the default), it results in
+tooltips that look like those displayed by other GTK+/NS/Haiku programs,
+but will not be able to display text properties inside tooltip text.  */);
   use_system_tooltips = true;
 
   DEFVAR_LISP ("iconify-child-frame", iconify_child_frame,