branch: externals/hyperbole
commit 13915afa9fcf6cdb0bd36fbceb89ef8e227a504b
Author: Mats Lidell <mats.lid...@lidells.se>
Commit: Mats Lidell <mats.lid...@lidells.se>
Rename ebut:act to ebut:act-label
---
ChangeLog | 5 +++++
hbut.el | 6 +++---
hui-menu.el | 4 ++--
3 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 3a7c5ce484..1cc9f2df1f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2024-02-08 Mats Lidell <ma...@gnu.org>
+* hui-menu.el (hui-menu-explicit-buttons): Use ebut:act-label.
+
+* hbut.el (ebut:act-label): Rename ebut:act to ebut:act-label, it takes a
+ label as arg.
+
* test/hyrolo-tests.el: Make hide tests more forgiving about hiding
section headers. Allows test cases to be used with different versions
of org.
diff --git a/hbut.el b/hbut.el
index fa09f5dd90..ee00cf9a74 100644
--- a/hbut.el
+++ b/hbut.el
@@ -3,7 +3,7 @@
;; Author: Bob Weiner
;;
;; Orig-Date: 18-Sep-91 at 02:57:09
-;; Last-Mod: 21-Jan-24 at 10:31:14 by Bob Weiner
+;; Last-Mod: 2-Feb-24 at 21:41:12 by Mats Lidell
;;
;; SPDX-License-Identifier: GPL-3.0-or-later
;;
@@ -122,7 +122,7 @@ indicating the source of any of its Hyperbole buttons.")
"*Non-nil value saves button data when button source is saved.
Nil disables saving.")
-(defun ebut:act (label)
+(defun ebut:act-label (label)
"Activate Hyperbole explicit button with LABEL from the current buffer."
(interactive (list (hargs:read-match "Activate explicit button labeled: "
(ebut:alist)
@@ -131,7 +131,7 @@ Nil disables saving.")
(but (ebut:get lbl-key)))
(if but
(hbut:act but)
- (error "(ebut:act): No explicit button labeled: %s" label))))
+ (error "(ebut:act-label): No explicit button labeled: %s" label))))
(defun ebut:alist (&optional file)
"Return alist of ebuts in FILE or the current buffer.
diff --git a/hui-menu.el b/hui-menu.el
index 7d3bd8abbd..650cb07c61 100644
--- a/hui-menu.el
+++ b/hui-menu.el
@@ -3,7 +3,7 @@
;; Author: Bob Weiner
;;
;; Orig-Date: 28-Oct-94 at 10:59:44
-;; Last-Mod: 21-Jan-24 at 10:31:58 by Bob Weiner
+;; Last-Mod: 2-Feb-24 at 21:41:16 by Mats Lidell
;;
;; SPDX-License-Identifier: GPL-3.0-or-later
;;
@@ -110,7 +110,7 @@ BROWSER-OPTION marks current active menu option as
selected."
(not hui-menu-order-explicit-buttons))
:style toggle :selected
hui-menu-order-explicit-buttons]
"Activate:")
- (mapcar (lambda (label) (vector label `(ebut:act
,label) t))
+ (mapcar (lambda (label) (vector label `(ebut:act-label
,label) t))
(if hui-menu-order-explicit-buttons
(sort labels #'string-lessp)
labels))
