[Emacs-diffs] emacs-24 24aacfc: Improve documentation of buttons (Bug#19628)

[Eli Zaretskii]

branch: emacs-24
commit 24aacfc9058dfff1331a64f50ced2ca4d6f25824
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    Improve documentation of buttons  (Bug#19628)
    
     doc/lispref/display.texi (Manipulating Buttons): Explain more about the
     'action' property.
---
 doc/lispref/ChangeLog    |    3 +++
 doc/lispref/display.texi |   10 ++++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index c855bbe..11a6f32 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,5 +1,8 @@
 2015-01-20  Eli Zaretskii  <address@hidden>
 
+       * display.texi (Manipulating Buttons): Explain more about the
+       'action' property.  (Bug#19628)
+
        * text.texi (Clickable Text): Improve indexing.  (Bug#19629)
 
 2015-01-15  Eli Zaretskii  <address@hidden>
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index 0128e46..9501e81 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}.
 @end defun
 
 @defun button-activate button &optional use-mouse-action
-Call @var{button}'s @code{action} property (i.e., invoke it).  If
address@hidden is address@hidden, try to invoke the button's
address@hidden property instead of @code{action}; if the button
-has no @code{mouse-action} property, use @code{action} as normal.
+Call @var{button}'s @code{action} property (i.e., invoke the function
+that is the value of that property, passing it the single argument
address@hidden).  If @var{use-mouse-action} is address@hidden, try to
+invoke the button's @code{mouse-action} property instead of
address@hidden; if the button has no @code{mouse-action} property, use
address@hidden as normal.
 @end defun
 
 @defun button-label button