branch: externals/hyperbole
commit 6e55a34ad0fb26008b847d28e104a3b9ad342e3f
Author: Bob Weiner <[email protected]>
Commit: Bob Weiner <[email protected]>
Fix ebut:get calls to send file as 3rd arg, not 2nd
---
.hypb | Bin 3248 -> 3226 bytes
Changes | 14 ++++++++++++++
hactypes.el | 5 +++--
hui.el | 13 +++++++------
4 files changed, 24 insertions(+), 8 deletions(-)
diff --git a/.hypb b/.hypb
index 3075990..64db9c9 100644
Binary files a/.hypb and b/.hypb differ
diff --git a/Changes b/Changes
index 1fb4150..f4c4970 100644
--- a/Changes
+++ b/Changes
@@ -1,3 +1,17 @@
+2020-02-27 Bob Weiner <[email protected]>
+
+* hui.el (hui:ebut-delete-op):
+hactypes.el (link-to-ebut): Fixed ebut:get call to send file as 3rd arg, not
2nd; now link-to-ebuts work.
+
+2020-02-26 Bob Weiner <[email protected]>
+
+* hyrolo.el (hyrolo-add): Removed conditional on entry-level-len when nil that
was causing an error during
+ adding of a record.
+
+==============================================================================
+V7.1.1 test release changes ^^^^:
+==============================================================================
+
2020-02-23 Bob Weiner <[email protected]>
* Published 7.1.0 test release.
diff --git a/hactypes.el b/hactypes.el
index 23bb070..b1ef7d7 100644
--- a/hactypes.el
+++ b/hactypes.el
@@ -284,7 +284,8 @@ This type of link is for use within a single editor
session. Use
"Perform action given by an explicit button, specified by KEY and optional
KEY-FILE.
KEY-FILE defaults to the current buffer's file name."
(interactive
- (let (but-file but-lbl)
+ (let (but-lbl
+ but-file)
(while (cond ((setq but-file
(read-file-name
"File of button to link to: " nil nil t))
@@ -311,7 +312,7 @@ KEY-FILE defaults to the current buffer's file name."
(setq normalized-file (hpath:normalize key-file)))
(setq normalized-file buffer-file-name))
- (if (setq but (and key-file (ebut:get key normalized-file)))
+ (if (setq but (and key-file (ebut:get key nil normalized-file)))
(hbut:act but)
(hypb:error "(link-to-ebut): No button `%s' in `%s'"
(ebut:key-to-label key)
diff --git a/hui.el b/hui.el
index e1222d0..e199f1d 100644
--- a/hui.el
+++ b/hui.el
@@ -19,6 +19,7 @@
(require 'hargs)
(require 'set)
(require 'hmail)
+(require 'hbut)
;;; ************************************************************************
;;; Public variables
@@ -197,12 +198,12 @@ Signal an error when no such button is found in the
current buffer."
(defun hui:ebut-rename (curr-label new-label)
"Rename explicit Hyperbole button given by CURR-LABEL to NEW-LABEL.
-If called interactively when point is not within an explicit button:
- prompt for old and new button label values and performs rename.
If called interactively when point is within an explicit button:
- save button label and tell user to edit label, then call again.
- second call changes the button's name from the stored value to the
- edited value.
+ save button label and tell user to: 1. edit label and 2. invoke this
+ same command again. The second invocation changes the button's name
+ from the stored value to the new value.
+If called interactively when point is not within an explicit button:
+ prompt for old and new button label values and perform rename.
Signal an error if any problem occurs."
(interactive
(save-excursion
@@ -760,7 +761,7 @@ within."
(if (if interactive
(ebut:delete)
(cond ((or (null key-src) (and (bufferp key-src) (setq buf key-src)))
- (setq ebut (ebut:get but-key key-src)))
+ (setq ebut (ebut:get but-key nil key-src)))
((and (stringp key-src)
(setq buf (find-file-noselect key-src)))
(setq ebut (ebut:get but-key buf)))
