aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/xfns.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 902570f804f..05b8ef46598 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12010-11-11 Julien Danjou <julien@danjou.info>
2
3 * xfns.c (Fx_show_tip): Fix typo in docstring.
4
12010-11-11 Stefan Monnier <monnier@iro.umontreal.ca> 52010-11-11 Stefan Monnier <monnier@iro.umontreal.ca>
2 6
3 * cmds.c (Fself_insert_command): Don't call XFASTINT without checking 7 * cmds.c (Fself_insert_command): Don't call XFASTINT without checking
diff --git a/src/xfns.c b/src/xfns.c
index 28566eb9a64..79e21fa0b50 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -5021,7 +5021,7 @@ change the tooltip's appearance.
5021Automatically hide the tooltip after TIMEOUT seconds. TIMEOUT nil 5021Automatically hide the tooltip after TIMEOUT seconds. TIMEOUT nil
5022means use the default timeout of 5 seconds. 5022means use the default timeout of 5 seconds.
5023 5023
5024If the list of frame parameters PARAMS contains a `left' parameters, 5024If the list of frame parameters PARMS contains a `left' parameters,
5025the tooltip is displayed at that x-position. Otherwise it is 5025the tooltip is displayed at that x-position. Otherwise it is
5026displayed at the mouse position, with offset DX added (default is 5 if 5026displayed at the mouse position, with offset DX added (default is 5 if
5027DX isn't specified). Likewise for the y-position; if a `top' frame 5027DX isn't specified). Likewise for the y-position; if a `top' frame