aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2015-01-20 21:20:39 +0200
committerEli Zaretskii2015-01-20 21:20:39 +0200
commit24aacfc9058dfff1331a64f50ced2ca4d6f25824 (patch)
tree96c99eb53754c204a231d567e0ba254184c18334
parent52ae3dbb217428fcd79c4ed922dfa0d51944e40a (diff)
downloademacs-24aacfc9058dfff1331a64f50ced2ca4d6f25824.tar.gz
emacs-24aacfc9058dfff1331a64f50ced2ca4d6f25824.zip
Improve documentation of buttons (Bug#19628)
doc/lispref/display.texi (Manipulating Buttons): Explain more about the 'action' property.
-rw-r--r--doc/lispref/ChangeLog3
-rw-r--r--doc/lispref/display.texi10
2 files changed, 9 insertions, 4 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index c855bbec863..11a6f32718c 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,5 +1,8 @@
12015-01-20 Eli Zaretskii <eliz@gnu.org> 12015-01-20 Eli Zaretskii <eliz@gnu.org>
2 2
3 * display.texi (Manipulating Buttons): Explain more about the
4 'action' property. (Bug#19628)
5
3 * text.texi (Clickable Text): Improve indexing. (Bug#19629) 6 * text.texi (Clickable Text): Improve indexing. (Bug#19629)
4 7
52015-01-15 Eli Zaretskii <eliz@gnu.org> 82015-01-15 Eli Zaretskii <eliz@gnu.org>
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index 0128e469db2..9501e8145fa 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -5511,10 +5511,12 @@ Set @var{button}'s @var{prop} property to @var{val}.
5511@end defun 5511@end defun
5512 5512
5513@defun button-activate button &optional use-mouse-action 5513@defun button-activate button &optional use-mouse-action
5514Call @var{button}'s @code{action} property (i.e., invoke it). If 5514Call @var{button}'s @code{action} property (i.e., invoke the function
5515@var{use-mouse-action} is non-@code{nil}, try to invoke the button's 5515that is the value of that property, passing it the single argument
5516@code{mouse-action} property instead of @code{action}; if the button 5516@var{button}). If @var{use-mouse-action} is non-@code{nil}, try to
5517has no @code{mouse-action} property, use @code{action} as normal. 5517invoke the button's @code{mouse-action} property instead of
5518@code{action}; if the button has no @code{mouse-action} property, use
5519@code{action} as normal.
5518@end defun 5520@end defun
5519 5521
5520@defun button-label button 5522@defun button-label button