aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/keyboard.c18
1 files changed, 12 insertions, 6 deletions
diff --git a/src/keyboard.c b/src/keyboard.c
index 841859bc0d4..dc70a3de70d 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -1910,9 +1910,15 @@ make_ctrl_char (c)
1910 WINDOW is the window in which the help was generated, if any. 1910 WINDOW is the window in which the help was generated, if any.
1911 It is nil if not in a window. 1911 It is nil if not in a window.
1912 1912
1913 OBJECT is the object where a `help-echo' property was found; POS 1913 If OBJECT is a buffer, POS is the position in the buffer where the
1914 is the position within OBJECT where it was found. OBJECT is nil 1914 `help-echo' text property was found.
1915 if HELP isn't from a `help-echo' text property. 1915
1916 If OBJECT is an overlay, that overlay has a `help-echo' property,
1917 and POS is the position in the overlay's buffer under the mouse.
1918
1919 If OBJECT is a string (an overlay string or a string displayed with
1920 the `display' property). POS is the position in that string under
1921 the mouse.
1916 1922
1917 OK_TO_IVERWRITE_KEYSTROKE_ECHO non-zero means it's okay if the help 1923 OK_TO_IVERWRITE_KEYSTROKE_ECHO non-zero means it's okay if the help
1918 echo overwrites a keystroke echo currently displayed in the echo 1924 echo overwrites a keystroke echo currently displayed in the echo
@@ -3172,9 +3178,9 @@ kbd_buffer_store_event (event)
3172 HELP is the help form. 3178 HELP is the help form.
3173 3179
3174 FRAME is the frame on which the help is generated. OBJECT is the 3180 FRAME is the frame on which the help is generated. OBJECT is the
3175 Lisp object where the help was found (a buffer, a string, or nil if 3181 Lisp object where the help was found (a buffer, a string, an
3176 neither from a string nor from a buffer. POS is the position 3182 overlay, or nil if neither from a string nor from a buffer. POS is
3177 within OBJECT where the help was found. 3183 the position within OBJECT where the help was found.
3178 3184
3179 Value is the number of input_events generated. */ 3185 Value is the number of input_events generated. */
3180 3186