Merge branch 'master' into scratch/correct-warning-posscratch/correct-warning-pos

1 files changed, 8 insertions, 0 deletions

diff --git a/src/frame.c b/src/frame.c
index e5d74edc168..8aaff949ba2 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -6472,6 +6472,14 @@ This variable is effective only with the X toolkit (and there only when
 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.  */);
+  use_system_tooltips = true;
+
   DEFVAR_LISP ("iconify-child-frame", iconify_child_frame,
                doc: /* How to handle iconification of child frames.
 This variable tells Emacs how to proceed when it is asked to iconify a