; Fix documentation about faces of tool-tip text

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

(cherry picked from commit 04c475a39f25b09b557e3183bcd5340d75120e0c)

diff --git a/lisp/tooltip.el b/lisp/tooltip.el
index 072a8c41ae2d22565929fa4f5dbb2b7cef42c986..eb95d99b034d793ecd2caeb4ba0f879f915e2095 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 44ba94d784153a9d3daaa3bc8bacc639ade01fa9..d14660acd1ea981a2181f46becb2f55f4ab1e47f 100644 (file)
--- a/src/frame.c
+++ b/src/frame.c
@@ -7153,11 +7153,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,