[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-24 310f707: lisp/button.el (button-activate, push-bu
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] emacs-24 310f707: lisp/button.el (button-activate, push-button): Doc fix. (Bug#19628) |
Date: |
Tue, 20 Jan 2015 18:16:20 +0000 |
branch: emacs-24
commit 310f7074519c3ea83e669effb87b2fc5a0d37f67
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>
lisp/button.el (button-activate, push-button): Doc fix. (Bug#19628)
---
lisp/ChangeLog | 4 ++++
lisp/button.el | 20 +++++++++++---------
2 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8a3d657..20efe68 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2015-01-20 Eli Zaretskii <address@hidden>
+
+ * button.el (button-activate, push-button): Doc fix. (Bug#19628)
+
2015-01-16 Samer Masterson <address@hidden> (tiny change)
* pcomplete.el (pcomplete-parse-arguments): Parse arguments
diff --git a/lisp/button.el b/lisp/button.el
index 189a1c2..e7602dd 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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-24 310f707: lisp/button.el (button-activate, push-button): Doc fix. (Bug#19628),
Eli Zaretskii <=