diff options
| author | Fabián Ezequiel Gallina <fgallina@gnu.org> | 2015-01-28 01:03:45 -0300 |
|---|---|---|
| committer | Fabián Ezequiel Gallina <fgallina@gnu.org> | 2015-01-28 01:03:45 -0300 |
| commit | 294127e7d59a5d23a32561716a1b192db410e12f (patch) | |
| tree | 4bc4f9690295e76ab4d220c474d37478a22740a8 /lisp/button.el | |
| parent | 358a8b34ac954ca147de9ececa4a51a21e60c97e (diff) | |
| parent | 24aacfc9058dfff1331a64f50ced2ca4d6f25824 (diff) | |
| download | emacs-294127e7d59a5d23a32561716a1b192db410e12f.tar.gz emacs-294127e7d59a5d23a32561716a1b192db410e12f.tar.bz2 emacs-294127e7d59a5d23a32561716a1b192db410e12f.zip | |
Merge from origin/emacs-24
24aacfc Improve documentation of buttons (Bug#19628)
52ae3db doc/lispref/text.texi (Clickable Text): Improve indexing. (Bug#19629)
310f707 lisp/button.el (button-activate, push-button): Doc fix. (Bug#19628)
3ee38f2 Disallow w32 builds --without-toolkit-scroll-bars.
e6518fc Fix display of images in R2L screen lines
b0af674 Use u+05f4 in TUTORIAL.he.
Diffstat (limited to 'lisp/button.el')
| -rw-r--r-- | lisp/button.el | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/lisp/button.el b/lisp/button.el index 189a1c23a4d..e7602dd7050 100644 --- a/lisp/button.el +++ b/lisp/button.el @@ -224,10 +224,10 @@ changes to a supertype are not reflected in its subtypes)." prop val)))) (defun button-activate (button &optional use-mouse-action) - "Call BUTTON's action property. -If USE-MOUSE-ACTION is non-nil, invoke the button's mouse-action -instead of its normal action; if the button has no mouse-action, -the normal action is used instead. + "Call BUTTON's `action' property. +If USE-MOUSE-ACTION is non-nil, invoke the button's `mouse-action' +property instead of `action'; if the button has no `mouse-action', +the value of `action' is used instead. The action can either be a marker or a function. If it's a marker then goto it. Otherwise it it is a function then it is @@ -429,11 +429,13 @@ instead of starting at the next button." (defun push-button (&optional pos use-mouse-action) "Perform the action specified by a button at location POS. POS may be either a buffer position or a mouse-event. If -USE-MOUSE-ACTION is non-nil, invoke the button's mouse-action -instead of its normal action; if the button has no mouse-action, -the normal action is used instead. The action may be either a -function to call or a marker to display and is invoked using -`button-activate' (which see). +USE-MOUSE-ACTION is non-nil, invoke the button's `mouse-action' +property instead of its `action' property; if the button has no +`mouse-action', the value of `action' is used instead. + +The action in both cases may be either a function to call or a +marker to display and is invoked using `button-activate' (which +see). POS defaults to point, except when `push-button' is invoked interactively as the result of a mouse-event, in which case, the |