summaryrefslogtreecommitdiff
path: root/lisp/tooltip.el
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2021-03-12 08:47:41 -0800
committerGlenn Morris <rgm@gnu.org>2021-03-12 08:47:41 -0800
commit74c389526f93cc4eded6759ffd3e1cfa4d429d6f (patch)
treeb5904c644dc1701ed7214ce6e997d2252c25f2c5 /lisp/tooltip.el
parentf7b7ecc4df7108da31625a3630cbbbdbec3abbd7 (diff)
parent2c5f21541957e2420e54ab2a70883140811708f7 (diff)
downloademacs-74c389526f93cc4eded6759ffd3e1cfa4d429d6f.tar.gz
Merge from origin/emacs-27
2c5f215419 Avoid crashes in Mew due to corrupted tool-bar label 7a23915618 * lisp/tooltip.el (tooltip): Doc fix for GTK. c4bbe02cc4 * lisp/help.el (help-for-help-internal): Doc fix; use impe... # Conflicts: # lisp/help.el # lisp/tooltip.el
Diffstat (limited to 'lisp/tooltip.el')
-rw-r--r--lisp/tooltip.el5
1 files changed, 4 insertions, 1 deletions
diff --git a/lisp/tooltip.el b/lisp/tooltip.el
index af3b86bba71..293c0343956 100644
--- a/lisp/tooltip.el
+++ b/lisp/tooltip.el
@@ -131,7 +131,10 @@ of the `tooltip' face are used instead."
:inherit variable-pitch)
(t
:inherit variable-pitch))
- "Face for tooltips."
+ "Face for tooltips.
+
+When using the GTK toolkit, this face will only be used if
+`x-gtk-use-system-tooltips' is non-nil."
:group 'basic-faces)
(defcustom tooltip-use-echo-area nil