summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Ingebrigtsen <larsi@gnus.org>2022-04-30 17:38:34 +0200
committerLars Ingebrigtsen <larsi@gnus.org>2022-04-30 17:38:34 +0200
commit655d2319bc50ee09d4acaf9ce90809f9476d8674 (patch)
tree3a4dd2fa72435c0167ee8518a220335b56fd3e62
parent86b6a69f8614663172c64a3f51ffce39526e7ca9 (diff)
downloademacs-655d2319bc50ee09d4acaf9ce90809f9476d8674.tar.gz
emacs-655d2319bc50ee09d4acaf9ce90809f9476d8674.tar.bz2
emacs-655d2319bc50ee09d4acaf9ce90809f9476d8674.zip
Use x-show-tooltip-timeout in all the implementations
* src/haikufns.c (Fx_show_tip): Use the timeout variable. * src/pgtkfns.c (Fx_show_tip): Ditto. * src/w32fns.c (Fx_show_tip): Ditto. * src/xfns.c (Fx_show_tip): Doc fix.
-rw-r--r--src/haikufns.c5
-rw-r--r--src/pgtkfns.c8
-rw-r--r--src/w32fns.c5
-rw-r--r--src/xfns.c3
4 files changed, 10 insertions, 11 deletions
diff --git a/src/haikufns.c b/src/haikufns.c
index fb79066b77f..f7c17567b18 100644
--- a/src/haikufns.c
+++ b/src/haikufns.c
@@ -2021,9 +2021,8 @@ DEFUN ("x-show-tip", Fx_show_tip, Sx_show_tip, 1, 6, 0,
f = decode_window_system_frame (frame);
if (NILP (timeout))
- timeout = make_fixnum (5);
- else
- CHECK_FIXNAT (timeout);
+ timeout = Vx_show_tooltip_timeout;
+ CHECK_FIXNAT (timeout);
if (NILP (dx))
dx = make_fixnum (5);
diff --git a/src/pgtkfns.c b/src/pgtkfns.c
index d1a72804cfe..a0fcf70f31b 100644
--- a/src/pgtkfns.c
+++ b/src/pgtkfns.c
@@ -3092,7 +3092,8 @@ PARMS is an optional list of frame parameters which can be used to
change the tooltip's appearance.
Automatically hide the tooltip after TIMEOUT seconds. TIMEOUT nil
-means use the default timeout of 5 seconds.
+means use the default timeout from the `x-show-tooltip-timeout'
+variable.
If the list of frame parameters PARMS contains a `left' parameter,
display the tooltip at that x-position. If the list of frame parameters
@@ -3138,9 +3139,8 @@ Text larger than the specified size is clipped. */)
return unbind_to (count, Qnil);
if (NILP (timeout))
- timeout = make_fixnum (5);
- else
- CHECK_FIXNAT (timeout);
+ timeout = Vx_show_tooltip_timeout;
+ CHECK_FIXNAT (timeout);
if (NILP (dx))
dx = make_fixnum (5);
diff --git a/src/w32fns.c b/src/w32fns.c
index ead1549d557..0f25c1a594a 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -7366,9 +7366,8 @@ DEFUN ("x-show-tip", Fx_show_tip, Sx_show_tip, 1, 6, 0,
decode_window_system_frame (frame);
if (NILP (timeout))
- timeout = make_fixnum (5);
- else
- CHECK_FIXNAT (timeout);
+ timeout = Vx_show_tooltip_timeout;
+ CHECK_FIXNAT (timeout);
if (NILP (dx))
dx = make_fixnum (5);
diff --git a/src/xfns.c b/src/xfns.c
index 24c3c260228..8f17ee67cd0 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -8292,7 +8292,8 @@ PARMS is an optional list of frame parameters which can be used to
change the tooltip's appearance.
Automatically hide the tooltip after TIMEOUT seconds. TIMEOUT nil
-means use the default timeout from the `x-show-tooltip-timeout'.
+means use the default timeout from the `x-show-tooltip-timeout'
+variable.
If the list of frame parameters PARMS contains a `left' parameter,
display the tooltip at that x-position. If the list of frame parameters