branch: externals/hyperbole
commit 32f6c69f8759e5d45af08b8688a7a77d7c72a02b
Merge: 409d052d93 99f50c2e14
Author: Robert Weiner <r...@gnu.org>
Commit: GitHub <nore...@github.com>
Merge pull request #505 from rswgnu/rsw
defil - Fix bug gh#rswgnu/hyperbole/503 button creation fails
---
ChangeLog | 19 ++++++++
hbut.el | 8 +++-
hibtypes.el | 98 ++++++++++++++++++++--------------------
man/hkey-help.txt | 2 +-
man/hyperbole.texi | 130 +++++++++++++++++++++++++++++++----------------------
man/version.texi | 4 +-
test/hbut-tests.el | 1 -
7 files changed, 153 insertions(+), 109 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index b46b30f40e..63cdce4e6b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2024-03-31 Bob Weiner <r...@gnu.org>
+
+* test/hbut-tests.el (hbut-tests--ibut-at-p-identifies-a-remote-pathname):
+ Code now fixed so this test passes; remove expected failure clause.
+
2024-03-31 Mats Lidell <ma...@gnu.org>
* .github/workflows/main.yml (jobs): Add Emacs 29.3 to versions used for
@@ -7,6 +12,20 @@
2024-03-31 Bob Weiner <r...@gnu.org>
+* hbut.el (defil): Fix bug gh#rswgnu/hyperbole/503 with change at
+ "hbut.el:L3058:C21" to add lbl-key when referent is extracted from
+ grouping 1 rather than the entire delimited string.
+
+* man/hyperbole.texi (Top):
+ man/version.texi: Update version to 9.0.2pre.
+
+* hibtypes.el (mail-address): Move so lower priority than 'pathname' ibtype
+ so that Tramp paths with embedded email addresses don't trigger as
+ 'mail-address' but as 'pathname'.
+ man/hyperbole.texi (Implicit Button Types): Change priority here too. Add
+ 'org-id', 'org-link-outside-org-mode' and 'python-tb-previous-line' ibtypes
+ doc.
+
* hyrolo.el (hyrolo-grep-file): Remove this line that was skipping past the
beginning of the first matching entry regexp and making matching entry
count too low by 1:
diff --git a/hbut.el b/hbut.el
index f26f70018e..cc2442dfc9 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-Mar-24 at 15:30:13 by Bob Weiner
+;; Last-Mod: 31-Mar-24 at 17:02:39 by Bob Weiner
;;
;; SPDX-License-Identifier: GPL-3.0-or-later
;;
@@ -3055,7 +3055,11 @@ commit changes."
,link-expr))
t nil button-text)))
;; link-expr is a string
- (ibtype:activate-link referent)))))))
+ (when referent
+ (if (string-match "\\(\\`\\|[^%]\\)\\(%s\\)" ,link-expr)
+ (ibut:label-set referent (match-beginning 1)
(match-end 1))
+ (ibut:label-set referent lbl-start lbl-end))
+ (ibtype:activate-link referent))))))))
(put (intern (format "ibtypes::%s" ',type))
'function-documentation
(or ,doc
diff --git a/hibtypes.el b/hibtypes.el
index 4135151230..8a8e3389e2 100644
--- a/hibtypes.el
+++ b/hibtypes.el
@@ -3,7 +3,7 @@
;; Author: Bob Weiner
;;
;; Orig-Date: 19-Sep-91 at 20:45:31
-;; Last-Mod: 27-Mar-24 at 20:15:24 by Mats Lidell
+;; Last-Mod: 31-Mar-24 at 15:17:46 by Bob Weiner
;;
;; SPDX-License-Identifier: GPL-3.0-or-later
;;
@@ -174,6 +174,54 @@ If the referenced location is found, return non-nil."
(goto-char mpos)
(kill-new (message (org-id-store-link)))))))))
+;;; ========================================================================
+;;; Composes mail, in another window, to the e-mail address at point.
+;;; ========================================================================
+
+(defun mail-address-at-p ()
+ "Return e-mail address, a string, that point is within or nil."
+ (let ((case-fold-search t))
+ (save-excursion
+ (skip-chars-backward "^ \t\n\r\f\"\'(){}[];:<>|")
+ (and (or (looking-at hypb:mail-address-regexp)
+ (looking-at (concat "mailto:"; hypb:mail-address-regexp)))
+ (save-match-data
+ (string-match hypb:mail-address-tld-regexp
(match-string-no-properties 1)))
+ (match-string-no-properties 1)))))
+
+(defib mail-address ()
+ "If on an e-mail address, compose mail to that address in another window.
+
+Applies to any major mode in `hypb:mail-address-mode-list', the HyRolo match
+buffer, any buffer attached to a file in `hyrolo-file-list', or any buffer with
+\"mail\" or \"rolo\" (case-insensitive) within its name.
+
+If `hypb:mail-address-mode-list' is set to nil, this button type is active
+in all buffers."
+ (when (let ((case-fold-search t))
+ (or
+ (and (or (null hypb:mail-address-mode-list)
+ (apply #'derived-mode-p hypb:mail-address-mode-list))
+ (not (string-match "-Elements\\'" (buffer-name)))
+ ;; Don't want this to trigger within an OOBR-FTR buffer.
+ (not (string-match "\\`\\(OOBR.*-FTR\\|oobr.*-ftr\\)"
+ (buffer-name)))
+ (not (string-equal "*Implementors*" (buffer-name))))
+ (and
+ (string-match "mail\\|rolo" (buffer-name))
+ ;; Don't want this to trigger in a mail/news summary buffer.
+ (not (or (hmail:lister-p) (hnews:lister-p))))
+ (when (boundp 'hyrolo-display-buffer)
+ (equal (buffer-name) hyrolo-display-buffer))
+ (and buffer-file-name
+ (boundp 'hyrolo-file-list)
+ (set:member (current-buffer)
+ (mapcar #'get-file-buffer
(hyrolo-get-file-list))))))
+ (let ((address (mail-address-at-p)))
+ (when address
+ (ibut:label-set address (match-beginning 1) (match-end 1))
+ (hact 'mail-other-window nil address)))))
+
;;; ========================================================================
;;; Displays files and directories when a valid pathname is activated.
;;; ========================================================================
@@ -294,54 +342,6 @@ display options."
(load "hsys-www")
-;;; ========================================================================
-;;; Composes mail, in another window, to the e-mail address at point.
-;;; ========================================================================
-
-(defun mail-address-at-p ()
- "Return e-mail address, a string, that point is within or nil."
- (let ((case-fold-search t))
- (save-excursion
- (skip-chars-backward "^ \t\n\r\f\"\'(){}[];:<>|")
- (and (or (looking-at hypb:mail-address-regexp)
- (looking-at (concat "mailto:"; hypb:mail-address-regexp)))
- (save-match-data
- (string-match hypb:mail-address-tld-regexp
(match-string-no-properties 1)))
- (match-string-no-properties 1)))))
-
-(defib mail-address ()
- "If on an e-mail address, compose mail to that address in another window.
-
-Applies to any major mode in `hypb:mail-address-mode-list', the HyRolo match
-buffer, any buffer attached to a file in `hyrolo-file-list', or any buffer with
-\"mail\" or \"rolo\" (case-insensitive) within its name.
-
-If `hypb:mail-address-mode-list' is set to nil, this button type is active
-in all buffers."
- (when (let ((case-fold-search t))
- (or
- (and (or (null hypb:mail-address-mode-list)
- (apply #'derived-mode-p hypb:mail-address-mode-list))
- (not (string-match "-Elements\\'" (buffer-name)))
- ;; Don't want this to trigger within an OOBR-FTR buffer.
- (not (string-match "\\`\\(OOBR.*-FTR\\|oobr.*-ftr\\)"
- (buffer-name)))
- (not (string-equal "*Implementors*" (buffer-name))))
- (and
- (string-match "mail\\|rolo" (buffer-name))
- ;; Don't want this to trigger in a mail/news summary buffer.
- (not (or (hmail:lister-p) (hnews:lister-p))))
- (when (boundp 'hyrolo-display-buffer)
- (equal (buffer-name) hyrolo-display-buffer))
- (and buffer-file-name
- (boundp 'hyrolo-file-list)
- (set:member (current-buffer)
- (mapcar #'get-file-buffer
(hyrolo-get-file-list))))))
- (let ((address (mail-address-at-p)))
- (when address
- (ibut:label-set address (match-beginning 1) (match-end 1))
- (hact 'mail-other-window nil address)))))
-
;;; ========================================================================
;;; Handles internal references within an annotated bibliography, delimiters=[]
;;; ========================================================================
diff --git a/man/hkey-help.txt b/man/hkey-help.txt
index 44bf67e102..6ec097bff3 100644
--- a/man/hkey-help.txt
+++ b/man/hkey-help.txt
@@ -10,7 +10,7 @@ Hyperbole
2nd press at an arg value Uses value as argument <- same
In minibuffer at eol Accepts minibuffer arg List completions
In minibuffer before eol Deletes rest of arg Deletes rest of arg
- On an implicit button/path Activates button Button help
+ On an implicit button/path Activates button/path Button help
Within a koutline cell Collapses and expands Shows tree props
Left of a koutline cell Creates a klink Moves a tree
HyRolo Match Buffer Edits entries and mails to e-mail addresses
diff --git a/man/hyperbole.texi b/man/hyperbole.texi
index cf419409b2..0561bd77c7 100644
--- a/man/hyperbole.texi
+++ b/man/hyperbole.texi
@@ -7,7 +7,7 @@
@c Author: Bob Weiner
@c
@c Orig-Date: 6-Nov-91 at 11:18:03
-@c Last-Mod: 27-Mar-24 at 20:28:14 by Mats Lidell
+@c Last-Mod: 31-Mar-24 at 16:08:15 by Bob Weiner
@c %**start of header (This is for running Texinfo on a region.)
@setfilename hyperbole.info
@@ -155,8 +155,8 @@ WITHOUT ANY WARRANTY, without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.</P>
<PRE>
-Edition 9.0.1
-Printed March 10, 2024.
+Edition 9.0.2pre
+Printed March 31, 2024.
Published by the Free Software Foundation, Inc.
Author: Bob Weiner
@@ -197,8 +197,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
@sp 2
@example
-Edition 9.0.1
-March 10, 2024
+Edition 9.0.2pre
+March 31, 2024
Published by the Free Software Foundation, Inc.
Author: Bob Weiner
@@ -2507,18 +2507,17 @@ activated anywhere within such a line.
@cindex stack frame
@cindex breakpoint
@cindex source line
-@item debugger-source
-Jump to the source line associated with a debugger stack frame or
-breakpoint line. This works with gdb, dbx, and xdb. Such lines are
-recognized in any buffer.
-
-@findex ibtypes hib-python-traceback
+@findex hib-python-traceback
@cindex pdb
@cindex python traceback
@cindex python error
@cindex source line
-@item hib-python-traceback
-Test for and jump to line referenced in Python pdb, traceback, or pytype error.
+@item debugger-source
+Jump to the source line associated with a debugger stack frame or
+breakpoint line. This works with gdb, dbx, and xdb. Such lines are
+recognized in any buffer. For example, in Python, this will test for
+and jump to a source line referenced in Python pdb, traceback, or
+pytype error.
@findex ibtypes grep-msg
@cindex grep
@@ -2528,7 +2527,7 @@ Test for and jump to line referenced in Python pdb,
traceback, or pytype error.
Jump to the line associated with a grep or compilation error message.
Messages are recognized in any buffer.
-@findex hyrolo-stuck-msg
+@findex ibtypes hyrolo-stuck-msg
@cindex hyrolo error
@item hyrolo-stuck-msg
Jump to the position where a HyRolo search has become stuck from the error.
@@ -2760,6 +2759,12 @@ Each line of the summary may be selected to jump to the
associated section.
Display any in-file Markdown link referent. Pathnames and urls are
handled elsewhere.
+@findex ibtypes org-link-outside-org-mode
+@cindex Org link, outside Org
+@item org-link-outside-org-mode
+@noindent
+Activate an Org link outside of an Org buffer.
+
@findex ibtypes git-commit-reference
@findex hypb:fgrep-git-log
@findex hypb:grep-git-log
@@ -2774,31 +2779,6 @@ and @code{hypb:grep-git-log} to list git commit
references whose changesets cont
either the string (fgrep) or regular expression (grep) given. Then an Action
Key
press displays the associated changeset.
-@findex ibtypes social-reference
-@cindex hashtag
-@cindex username
-@cindex social media
-@cindex social reference
-@vindex hibtypes-social-default-service
-@item social-reference
-Display the web page associated with a social media hashtag or
-username reference at point.
-
-Reference format is:
-@example
-[facebook|instagram|twitter]?[#@@]<hashtag-or-username> or
-[fb|in|tw]?[#@@]<hashtag-or-username>
-@end example
-
-@noindent
-For example, @samp{fb@@someuser} displays the home page for facebook user
-@samp{someuser} and @samp{in#hashtag} displays photos with the hashtag
-@samp{hashtag}. The first part of the label for a button of this type
-is the social media service name. The service name defaults to the
-value of @code{hibtypes-social-default-service} (default value of
-``twitter'') when not given, so #hashtag would be the same as
-twitter#hashtag.
-
@findex ibtypes annot-bib
@cindex bibliography
@cindex reference
@@ -2808,19 +2788,6 @@ as the reference. References must be delimited by
square brackets, must
begin with a word constituent character, and must not be in buffers
whose names begin with a ` ' or `*' character.
-@findex ibtypes mail-address
-@cindex e-mail address
-@cindex rolo address
-@cindex address
-@item mail-address
-If on an e-mail address in a specific buffer type, compose mail to that
-address in another window. Applies to any major mode descended from those
-in @code{hypb:mail-address-mode-list}, the HyRolo match buffer, any buffer
-attached to a file included in @code{hyrolo-file-list}, or any buffer with
-@file{mail} or @file{rolo} (case-insensitive) within its name. If
-@code{hypb:mail-address-mode-list} is set to @samp{nil}, this button type is
-active in all buffers.
-
@findex ibtypes www-url
@cindex URL
@cindex World-wide Web
@@ -2884,6 +2851,27 @@ PATH-style variable, the path at point is displayed;
empty paths,
e.g. @file{::} represent the current directory, @file{.}. Must have at
least four paths within the variable value for this to work.
+@findex ibtypes mail-address
+@cindex e-mail address
+@cindex rolo address
+@cindex address
+@item mail-address
+If on an e-mail address in a specific buffer type, compose mail to that
+address in another window. Applies to any major mode descended from those
+in @code{hypb:mail-address-mode-list}, the HyRolo match buffer, any buffer
+attached to a file included in @code{hyrolo-file-list}, or any buffer with
+@file{mail} or @file{rolo} (case-insensitive) within its name. If
+@code{hypb:mail-address-mode-list} is set to @samp{nil}, this button type is
+active in all buffers.
+
+@findex ibtypes org-id
+@cindex Org IDs
+@cindex Org Roam IDs
+@item org-id
+With an Action Key press on an Org Roam or Org node ID at point,
+display the associated node. If on the :ID: definition line, display
+a message about how to copy the id.
+
@findex ibtypes hyperbole-run-test-definition
@cindex edebugging tests
@cindex debugging tests
@@ -2897,21 +2885,55 @@ With an Action Key press on the name in the first line
of an ert test
def, evaluate and run the ERT test. With an Assist Key press instead,
edebug the test and step through it.
+@findex ibtypes social-reference
+@cindex hashtag
+@cindex username
+@cindex social media
+@cindex social reference
+@vindex hibtypes-social-default-service
+@item social-reference
+Display the web page associated with a social media hashtag or
+username reference at point.
+
+Reference format is:
+@example
+[facebook|instagram|twitter]?[#@@]<hashtag-or-username> or
+[fb|in|tw]?[#@@]<hashtag-or-username>
+@end example
+
+@noindent
+For example, @samp{fb@@someuser} displays the home page for facebook user
+@samp{someuser} and @samp{in#hashtag} displays photos with the hashtag
+@samp{hashtag}. The first part of the label for a button of this type
+is the social media service name. The service name defaults to the
+value of @code{hibtypes-social-default-service} (default value of
+``twitter'') when not given, so #hashtag would be the same as
+twitter#hashtag.
+
@findex ibtypes hyperbole-run-tests
+@cindex ert
+@cindex testing
@item hyperbole-run-tests
Recognize Action Buttons of the form @code{<hyperbole-run-tests
test-selector>} which when activated run Hyperbole tests using the ERT
framework. The @code{test-selector} argument is as described in
@code{ert-select-tests}.
-
@findex ibtypes hyperbole-run-test
@item hyperbole-run-test
Recognize Action Buttons of the form @code{<hyperbole-run-test
test-name>} which when activated run individual Hyperbole tests, each
given by the @code{<test-name>} argument, an unquoted name.
-@end table
+@finex ibtypes python-tb-previous-line ()
+@cindex python traceback
+@cindex stack frame
+@item python-tb-previous-line
+Move to prior line with potential Python line ref. In Python,
+tracebacks may be on a line just below the source reference line so
+since not on a Hyperbole button, move back a line and check for a
+source reference line again.
+@end table
@node Action Buttons, , Implicit Button Types, Implicit Buttons
@subsection Action Buttons
diff --git a/man/version.texi b/man/version.texi
index 5e31a8bea4..b7c4183bb9 100644
--- a/man/version.texi
+++ b/man/version.texi
@@ -1,4 +1,4 @@
@set UPDATED March, 2024
@set UPDATED-MONTH March 2024
-@set EDITION 9.0.1
-@set VERSION 9.0.1
+@set EDITION 9.0.2pre
+@set VERSION 9.0.2pre
diff --git a/test/hbut-tests.el b/test/hbut-tests.el
index a8b4086076..d5f58d8e50 100644
--- a/test/hbut-tests.el
+++ b/test/hbut-tests.el
@@ -770,7 +770,6 @@ See #10 for the proper way to add an ibutton name.
(ert-deftest hbut-tests--ibut-at-p-identifies-a-remote-pathname ()
"Verify `ibut:at-p' identifies a remote pathname."
- :expected-result :failed
(hattr:clear 'hbut:current)
(with-temp-buffer
(insert "/ssh:u...@host.org:/home/user/file\n")
