Skip to content

link-to-ibut - Fix infinite loop, in-buffer links and but attr refs; smart-emacs-lisp-mode-p - Add support for comint-mode and complilation-mode #970

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rswgnu merged 2 commits into from
Jun 7, 2026
Merged

link-to-ibut - Fix infinite loop, in-buffer links and but attr refs; smart-emacs-lisp-mode-p - Add support for comint-mode and complilation-mode #970

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b841d60
link-to-ibut - Fix infinite loop, in-buffer links and but attr refs
rswgnu Jun 7, 2026
5c59625
Merge branch 'master' into rsw
rswgnu Jun 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 36 additions & 0 deletions ChangeLog
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,42 @@
* test/hibtypes-tests.el (hibtypes-tests--hib-python-traceback):
Verify `hib-python-traceback' matches python debugger source ibuts.

2026-06-07 Bob Weiner <[email protected]>

* hmouse-tag.el (smart-emacs-lisp-mode-p): Add support for 'comint-mode'
used by shell buffers and 'compilation-mode' that contain elisp symbols.

2026-06-06 Bob Weiner <[email protected]>

* test/hui-tests.el (hui--ibut-create-interactive)
(hui--ibut-create-interactive-add-comment-char)
(hui--ibut-create-interactive-label-using-region):

2026-06-05 Bob Weiner <[email protected]>

* hbut.el (ibut:to): Fix to search for 'name-key' surrounded by
implicit button name delimiters. Avoids matching to
<ilink:name-key> action buttons.
(ibut:to-text): Allow movement to the linked ibut if point
is on an ilink. Fixes bug where in-buffer ilinks did not work.
Remove check of any hbut:current attributes prior to moving to the
linked to ibut as these refer to the link-to-ibut button.
(ibut:insert-text): For 'actypes::link-to-ibut', convert
label key to label text.
hui.el (hui:link-possible-types): Fix 'link-to-ibut' to use label
text rather than label key and don't include the location if
the link is to a button within the source buffer.
(ibut:insert-text): Use 'actype:def-symbol' and don't expose
actypes:: prefix.

* MANIFEST: (hui-register.el): Add missing entry.

* hbut.el (ibut:to-text): Error if 'lbl-key' is an empty string.

* hactypes.el: (link-to-ibut): Fix infinite loop in <ilink:label> links
by replacing 'hbut:act' call with a call to 'actype:act' which
utilizes the actype computed from the prior 'ibut:at-p' call.

2026-06-05 Mats Lidell <[email protected]>

* hui.el (kcell-view:label): Declare function.
Expand Down
35 changes: 21 additions & 14 deletions FAST-DEMO
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@



* GNU Hyperbole Fast Demo by Bob Weiner

Send an email or a testimonial if you like Hyperbole to <[email protected]>.
Expand All @@ -12,16 +14,19 @@
* Introductory Videos

If you prefer video introductions, visit the videos linked to in the tables below;
otherwise, skip to the next section. The first table is an overview talk of
Hyperbole broken into few minute sections that you can watch individually. The
second table has links to separate videos covering aspects of Hyperbole.
otherwise, skip to the next section. The first table, "#Hyperbole Overview Video",
is an overview talk of Hyperbole broken into few minute sections that you can watch
individually. The second table has links to separate videos covering aspects of
Hyperbole, including the full <ilink:Overview and Demo>.

** Hyperbole Overview Video

Hyperbole video demos start with 'section 06 - Hyperbole Buttons' in this first
Demos of Hyperbole features start in 'section 06 - Hyperbole Buttons' in this first
table. Press {M-RET} either in the first column <[button name]> or in the second
column video link to watch each section.

|--------------------------------------+-----------------------------------------|
| Hyperbole Video Overview Sections | Video Snippets |
| Hyperbole Overview Video Sections | Video Snippets |
|--------------------------------------+-----------------------------------------|
|--------------------------------------+-----------------------------------------|
| 01. <[Introduction]> | <yt-play "WKwZHSbHmPg" "0:01" "1:38"> |
Expand All @@ -48,8 +53,10 @@
| 22. <[The Big Picture]> | <yt-play "WKwZHSbHmPg" "54:25" "56:44"> |
|--------------------------------------+-----------------------------------------|

** Hyperbole Videos

|-----------------------------------------------------+------------------------------|
| GNU Hyperbole Videos | Web Link |
| GNU Hyperbole Videos | Web Links |
|-----------------------------------------------------+------------------------------|
|-----------------------------------------------------+------------------------------|
| <[Overview and Demo]> | https://youtu.be/WKwZHSbHmPg |
Expand Down Expand Up @@ -186,7 +193,7 @@
directories. By default, Org files, Python files and Elisp files are
handled.

"(hyperbole)action-key-modeline-function"
"(hyperbole)action-key-modeline-function"

Double quoted Info manual references are also implicit buttons. You
can link to both nodes/sections in GNU Info manuals as well as to
Expand Down Expand Up @@ -271,7 +278,7 @@
within key series surrounded by parentheses maintain spaces between
words without the need to use 'SPC'.

{M-x shell RET M-> (export HYPERBOLE_DIR=${hyperb:dir} &&
{M-x shell RET M-> (export HYPERBOLE_DIR=${hyperb:dir} &&
cd $HYPERBOLE_DIR && grep -n gbut:label-list *.el) RET}

Use both a Hyperbole resolved variable, ${hyperb:dir}, and a
Expand Down Expand Up @@ -449,22 +456,22 @@ To learn how to create new kinds of implicit button and action types, see
a HyWikiWord is a capitalized word that contains upper and lowercase
letters only and has a corresponding HyWikiWord.org wiki page file
below `hywiki-directory'. HyWikiWords require no delimiters.

Use {M-RET} on the first line of the expression below to set a demo
HyWiki directory and turn on hywiki-mode so HyWikiWords are
highlighted outside of the HyWiki directory.

<progn (setq hywiki-directory (hpath:expand "${hyperb:dir}/hywiki/"))
(hywiki-mode 1)>

Now all these wiki-words should be highlighted and can appear in any
text buffer and will be treated as hyperlinks. Simply press {M-RET}
on each to display the associated wiki page:

HyWiki
HyWikiMenus
Publishing

Let's create a new page. Press {M-RET} on the HyWikiWord below:

TestWord
Expand Down
1 change: 1 addition & 0 deletions MANIFEST
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ hui-jmenu.el - Popup menus for jumping to and managing buffers, frames,
hui-menu.el - Menubar menu of GNU Hyperbole commands
hui-mini.el - Single line command menus for GNU Hyperbole
hui-mouse.el - Use key or mouse key for many functions, e.g. GNU Hyperbole menus
hui-register.el - Hyperbole links to Emacs registers
hui-select.el - Select delimited or larger and larger syntax-driven regions in a buffer
hui-treemacs.el - GNU Hyperbole Smart Key support for the Treemacs file manager package
hui-window.el - Smart Mouse Key window and modeline depress/release actions
Expand Down
14 changes: 10 additions & 4 deletions hactypes.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
;; Author: Bob Weiner
;;
;; Orig-Date: 23-Sep-91 at 20:34:36
;; Last-Mod: 28-Mar-26 at 13:03:44 by Bob Weiner
;; Last-Mod: 5-Jun-26 at 08:42:07 by Bob Weiner
;;
;; SPDX-License-Identifier: GPL-3.0-or-later
;;
Expand Down Expand Up @@ -560,7 +560,8 @@ on the implicit button to which to link."

(unless name-key
(hypb:error "(link-to-ibut): Point must be on an implicit button to create a link-to-ibut"))
(let (but
(let (actype
but
normalized-file)
(if but-src
(unless (and (get-buffer but-src)
Expand All @@ -576,8 +577,13 @@ on the implicit button to which to link."
(goto-char (min point (point-max))))
(setq but (ibut:to-text name-key))
(cond (but
(setq but (ibut:at-p))
(hbut:act but))
(setq actype (actype:def-symbol (hattr:get but 'actype)))
(if (eq actype 'link-to-ibut)
(hypb:error "(link-to-ibut): Failed to find implicit button named `%s' in `%s'"
(ibut:key-to-label name-key)
(or but-src (buffer-name)))
(apply #'actype:act (hattr:get but 'actype)
(hattr:get but 'args))))
(name-key
(hypb:error "(link-to-ibut): No implicit button named `%s' found in `%s'"
(ibut:key-to-label name-key)
Expand Down
99 changes: 48 additions & 51 deletions hbut.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
;; Author: Bob Weiner
;;
;; Orig-Date: 18-Sep-91 at 02:57:09
;; Last-Mod: 15-Mar-26 at 22:16:44 by Bob Weiner
;; Last-Mod: 7-Jun-26 at 11:26:22 by Bob Weiner
;;
;; SPDX-License-Identifier: GPL-3.0-or-later
;;
Expand Down Expand Up @@ -1250,8 +1250,8 @@ button file) or within the current buffer if both are null. Use
of point when desired.

Caller must have used (ibut:at-p) to create hbut:current prior to
calling this function. When KEY-SRC is given, this set's
hbut:current's \\='loc attribute to KEY-SRC."
calling this function. The `hbut:current' \\='loc attribute is set
to KEY-SRC when it is provided."
(if buffer
(if (bufferp buffer)
(set-buffer buffer)
Expand Down Expand Up @@ -2683,67 +2683,68 @@ Summary of operations based on inputs (name arg from \\='hbut:current attrs):
(insert ibut:label-separator))))
(let* ((orig-actype (or (hattr:get ibut 'actype)
(hattr:get ibut 'categ)))
(actype (or (actype:elisp-symbol orig-actype)
(actype (or (actype:def-symbol (actype:elisp-symbol orig-actype))
(and (symbolp orig-actype) (fboundp orig-actype)
orig-actype)))
(args (hattr:get ibut 'args))
(arg1 (nth 0 args))
(arg2 (nth 1 args))
(arg3 (nth 2 args)))
(pcase actype
('actypes::kbd-key
('kbd-key
(cond ((and (stringp arg1) (string-match "\\s-*{.+}\\s-*" arg1))
(insert arg1))
((stringp arg1)
(insert "{" arg1 "}"))
(t (insert "{}"))))
((or 'actypes::link-to-directory 'actypes::link-to-Info-node 'actypes::link-to-Info-index-item)
((or 'link-to-directory 'link-to-Info-node 'link-to-Info-index-item)
(insert "\"" arg1 "\""))
('actypes::annot-bib (insert "[" arg1 "]"))
('actypes::exec-shell-cmd (insert "\"!" arg1 "\""))
('actypes::exec-window-cmd (insert "\"&" arg1 "\""))
('actypes::link-to-gbut (insert "<glink:" arg1 ">"))
('actypes::link-to-ebut (progn (insert "<elink:" arg1)
(when arg2 (insert ": " arg2))
(insert ">")))
('actypes::link-to-ibut (progn (insert "<ilink:" arg1)
(when arg2 (insert ": " arg2))
(insert ">")))
('actypes::link-to-kcell
('annot-bib (insert "[" arg1 "]"))
('exec-shell-cmd (insert "\"!" arg1 "\""))
('exec-window-cmd (insert "\"&" arg1 "\""))
('link-to-gbut (insert "<glink:" arg1 ">"))
('link-to-ebut (progn (insert "<elink:" arg1)
(when arg2 (insert ": " arg2))
(insert ">")))
('link-to-ibut (progn (insert "<ilink:"
(hbut:key-to-label arg1))
(when arg2 (insert ": " arg2))
(insert ">")))
('link-to-kcell
(if arg2
(progn (insert "<")
(when arg1 (insert arg1))
(insert ", " arg2 ">"))
(insert "<@ ")
(when arg1 (insert arg1))
(insert ">")))
((or 'actypes::link-to-kotl 'klink:act)
((or 'link-to-kotl 'klink:act)
(when (stringp arg1)
(if (string-prefix-p "<" arg1)
(insert arg1)
(insert "<" arg1 ">"))))
;; Insert an Org-style link here so can include the Org title linked
;; to for clarity.
('actypes::link-to-org-id
('link-to-org-id
(insert (if arg2
(format "[[id:%s][%s]]" arg1 arg2)
(format "[[id:%s]]" arg1))))
('actypes::link-to-rfc (insert (format "rfc%d" arg1)))
('actypes::link-to-wikiword (insert (if (and (stringp arg1)
(string-match-p "\\s-" arg1))
;; Double-quote when has a space
(format "\"%s\"" arg1)
arg1)))
('link-to-rfc (insert (format "rfc%d" arg1)))
('link-to-wikiword (insert (if (and (stringp arg1)
(string-match-p "\\s-" arg1))
;; Double-quote when has a space
(format "\"%s\"" arg1)
arg1)))
('man (insert arg1))
('actypes::man-show (insert arg1))
('actypes::link-to-file-line (insert (format "\"%s:L%d\""
(hpath:shorten arg1) arg2)))
('actypes::link-to-file-line-and-column
('man-show (insert arg1))
('link-to-file-line (insert (format "\"%s:L%d\""
(hpath:shorten arg1) arg2)))
('link-to-file-line-and-column
(insert
(if (eq arg3 0)
(format "\"%s:L%d\"" (hpath:shorten arg1) arg2)
(format "\"%s:L%d:C%d\"" (hpath:shorten arg1) arg2 arg3))))
('actypes::link-to-file
('link-to-file
;; arg2 when given is a buffer position
(insert "\""
(if arg2
Expand All @@ -2752,14 +2753,14 @@ Summary of operations based on inputs (name arg from \\='hbut:current attrs):
;; filename only
(hpath:shorten arg1))
"\""))
('actypes::link-to-string-match
('link-to-string-match
(insert (format "\"%s#%s%s\"" (hpath:shorten arg3) arg1
(if (<= arg2 1) "" (concat ":I" (number-to-string arg2))))))
('actypes::link-to-texinfo-node
('link-to-texinfo-node
(insert (format "\"%s#%s\"" (hpath:shorten arg1) arg2)))
('nil (error "(ibut:insert-text): actype must be a Hyperbole actype or Lisp function symbol, not '%s'" orig-actype))
;; Generic action button type
(_ (insert (format "<%s%s%s>" (or (actype:def-symbol actype) actype)
(_ (insert (format "<%s%s%s>" actype
(if args " " "")
(if args (hypb:format-args args) "")))))
(unless (looking-at "\\s-\\|\\'")
Expand Down Expand Up @@ -2862,7 +2863,10 @@ When NAME-KEY is nil, return the ibutton at point or nil if none."
;; Handle a name given rather than a name key
(when (string-match-p "\\s-" name-key)
(setq name-key (ibut:label-to-key name-key)))
(let ((regexp (ibut:name-regexp name-key t))
(let ((regexp
(concat (regexp-quote ibut:label-start)
"\\(" (ibut:name-regexp name-key t) "\\)"
(regexp-quote ibut:label-end)))
(start (point))
at-name-key
pos
Expand All @@ -2874,7 +2878,7 @@ When NAME-KEY is nil, return the ibutton at point or nil if none."
(forward-line 0)
;; re-search forward
(while (and (not found) (re-search-forward regexp nil t))
(setq pos (match-beginning 0)
(setq pos (match-beginning 1)
;; Point might be on closing delimiter of ibut in which
;; case ibut:label-p returns nil; move back one
;; character to prevent this.
Expand All @@ -2886,7 +2890,7 @@ When NAME-KEY is nil, return the ibutton at point or nil if none."
(goto-char start))
;; re-search backward
(while (and (not found) (re-search-backward regexp nil t))
(setq pos (match-beginning 0)
(setq pos (match-beginning 1)
at-name-key (ibut:at-p t)
found (equal at-name-key name-key))))
(when found
Expand Down Expand Up @@ -2959,35 +2963,28 @@ Find the nearest implicit button with LBL-KEY (a name or name key)
within the visible portion of the current buffer and move to within
its button text. This will find an implicit button if point is
within its name or text or if LBL-KEY is a name/name-key of an
existing implicit button. It will not find other unnamed implicit
buttons.
existing implicit button within the current buffer. It will not
find other unnamed implicit buttons.

The caller must have populated the attributes of \='hbut:current.

Return the symbol for the button if found, else nil."
(unless (stringp lbl-key)
(error "(ibut:to-text): %s 'lbl-key' arg must be a string, not: %S"
(unless (and (stringp lbl-key) (not (string-empty-p lbl-key)))
(error "(ibut:to-text): %s 'lbl-key' arg must be a non-empty string, not: %S"
(hattr:get 'hbut:current 'categ)
lbl-key))
(hbut:funcall
(lambda (lbl-key _buffer _key-src)
(let* ((name-end (hattr:get 'hbut:current 'name-end))
(at-name (hattr:get 'hbut:current 'name))
(at-text-key (hattr:get 'hbut:current 'lbl-key))
(opoint (point))
(let* ((opoint (point))
move-flag
start
ibut)
;; Do not move point if it is already in the text of an
;; implicit button matching LBL-KEY. If on the name of
;; the same button, move into the text of the button.
(cond ((and lbl-key (equal at-text-key lbl-key))
(setq ibut 'hbut:current))
((and at-name (equal (ibut:label-to-key at-name) lbl-key))
(setq ibut 'hbut:current
move-flag t))
((and lbl-key (setq ibut (ibut:to lbl-key)))
(setq move-flag t)))
(when (and lbl-key (setq ibut (ibut:to lbl-key)))
(setq move-flag t))

(when (and move-flag ibut)
;; Skip past any optional name and separators
(if (setq start (hattr:get ibut 'lbl-start))
Expand Down
Loading