Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
55 changes: 55 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,58 @@
2026-07-14 Bob Weiner <rsw@gnu.org>

* hsys-org.el (hsys-org-link-at-p): Fix code at the end to remove hy: prefix
from 'label'.

* test/smart-org-tests.el (smart-org-mode-with-smart-keys-buttons-on-org-link-activates):
Replace 'org-open-at-point' with 'org-link-open-from-string' to get more
flexibility in link syntax handling.
(smart-org-mode-with-smart-keys-buttons-on-org-link-activates,
smart-org-mode-with-smart-keys-on-org-link-activates):
Replace 'org-open-at-point' with 'org-link-open-from-string' to get more
flexibility in link syntax handling.


* hactypes.el (link-to-ibut): Fix so 'key-src-buf-flag' is only set non-nil
when key-src is or is set to a buffer object.

2026-07-13 Bob Weiner <rsw@gnu.org>

* man/hyperbole.texi (Keyboard Drags): Add table of contexts and
associated link action types in decreasing priority order, used
when creating links in a 2-window source-target configuration.

* hui.el (hui:link-possible-types):
hbut.el (ibut:insert-text): Add 'link-to-denote' support.

* hactypes.el (link-to-ibut): Fix so if find key-src buffer from a buffer
name, then set the key-src to the buffer object or else later 'ibut:get'
call will fail.

* hsys-org.el (hsys-org-link-at-p): Change to allow a Wikiword in an Org
link description only if it is the entire description.

2026-07-12 Bob Weiner <rsw@gnu.org>

* hui-mouse.el (require 'hsys-denote): Add and handle denote links ahead
of other Org link types so can handle Hyperbole #section syntax too.

* hui-mouse.el (smart-org): Change 'org-link' to 'org-link-open-from-string'
to better control the link string sent when Org does not highlight the
full link reference string, typically when using the prefix: syntax
without double bracket delimiters.

* hbut.el (hbut:label-to-key): Remove any label properties so potentially
long property list does not show in help buffers.

2026-07-11 Bob Weiner <rsw@gnu.org>

* hsys-denote.el: Add with ibtype 'denote-link', actype 'link-to-denote',
and functions 'hsys-denote-file-at-p', 'hsys-denote-link-at-p',
'hsys-denote-get-description-from-id' and
'sys-denote-get-id-from-description'.
MANIFEST, Makefile: Add hsys-denote.el entry.
hywiki.el (hywiki-wikiword-to-string): Add.

2026-07-11 Mats Lidell <matsl@gnu.org>

* Makefile (package): Depend on tar-file.
Expand Down
2 changes: 1 addition & 1 deletion MANIFEST
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ topwin.py - Python script to find the topmost macOS app window at a s
* --- EXTERNAL SYSTEM ENCAPSULATIONS ---
hsys-activities.el - GNU Hyperbole support functions for Activities
hsys-consult.el - Hyperbole interactive consult-grep convenience functions
hsys-ert.el - Hyperbole support for jumping to ert 'should' source lines
hsys-denote.el - GNU Hyperbole support functions for denote note-taking
hsys-flymake.el - Add missing source buffer keymap to flymake linter
hsys-org.el - GNU Hyperbole support functions for Org mode
hsys-org-roam.el - GNU Hyperbole support functions for Org Roam
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Author: Bob Weiner
#
# Orig-Date: 15-Jun-94 at 03:42:38
# Last-Mod: 11-Jul-26 at 21:49:31 by Mats Lidell
# Last-Mod: 14-Jul-26 at 02:12:12 by Bob Weiner
#
# Copyright (C) 1994-2026 Free Software Foundation, Inc.
# See the file HY-COPY for license information.
Expand Down Expand Up @@ -215,7 +215,7 @@ EL_COMPILE = hact.el hactypes.el hargs.el hbdata.el hbmap.el hbut.el \
hinit.el hload-path.el hmail.el hmh.el hmoccur.el hmouse-info.el \
hmouse-drv.el hmouse-key.el hmouse-mod.el hmouse-sh.el hmouse-tag.el \
hpath.el hproperty.el hrmail.el hsettings.el hsmail.el hsys-consult.el \
hsys-ert.el hsys-flymake.el hsys-activities.el \
hsys-denote.el hsys-ert.el hsys-flymake.el hsys-activities.el \
hsys-org.el hsys-org-roam.el hsys-www.el hsys-xref.el hsys-youtube.el htz.el \
hycontrol.el hui-jmenu.el hui-menu.el hui-mini.el hui-mouse.el hui-select.el \
hui-treemacs.el hui-window.el hui.el hvar.el hversion.el hynote.el hypb.el hyperbole.el \
Expand Down
16 changes: 10 additions & 6 deletions hactypes.el
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: 10-Jul-26 at 12:29:32 by Bob Weiner
;; Last-Mod: 14-Jul-26 at 00:15:46 by Bob Weiner
;;
;; SPDX-License-Identifier: GPL-3.0-or-later
;;
Expand Down Expand Up @@ -549,10 +549,11 @@ on the implicit button to which to link."
(let ((ibut-name-key (ibut:at-p t)))
(cond (ibut-name-key
(list ibut-name-key (or (hypb:buffer-file-name) (buffer-name)) (point)))
;; !! TODO: If default is null below and are creating, rather than editing
;; the link, it would be better to throw an error than create
;; an invalid link, but it is difficult to tell which operation
;; is in progress, so ignore this for now. -- RSW, 01-25-2020
;; !! TODO: If default is null below and are creating, rather
;; than editing the link, it would be better to throw an error
;; than create an invalid link, but it is difficult to tell which
;; operation is in progress, so ignore this for now. -- RSW,
;; 01-25-2020

;; When not on an ibut and editing the link, use existing arguments
((and (bound-and-true-p hargs:defaults) (listp hargs:defaults) hargs:defaults)
Expand All @@ -564,7 +565,10 @@ on the implicit button to which to link."
(hypb:error "(link-to-ibut): Point must be on an implicit button to create a link-to-ibut"))

(let* ((key-src-buf-flag (or (bufferp key-src)
(and (stringp key-src) (get-buffer key-src))))
(and (stringp key-src)
(setq key-src (or (get-buffer key-src)
key-src))
(bufferp key-src))))
(but (if key-src-buf-flag
(ibut:get name-key key-src)
(ibut:get name-key nil key-src)))
Expand Down
6 changes: 4 additions & 2 deletions hbut.el
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: 10-Jul-26 at 12:26:12 by Bob Weiner
;; Last-Mod: 13-Jul-26 at 19:23:07 by Bob Weiner
;;
;; SPDX-License-Identifier: GPL-3.0-or-later
;;
Expand Down Expand Up @@ -1539,7 +1539,8 @@ whitespace sequences with `_'."
"\\`[ \t\n\r]+\\|\\([\\?][ \t\n\r]+\\'\\)\\|[ \t\n\r]+\\'"
"\\1" label)
label (replace-regexp-in-string "_" "__" label nil t))
(replace-regexp-in-string "[ \t\n\r]+" "_" label nil t)))
(substring-no-properties
(replace-regexp-in-string "[ \t\n\r]+" "_" label nil t))))

(defun hbut:list (&optional file loc-p)
"Return list of button labels from in FILE or the current buffer.
Expand Down Expand Up @@ -2734,6 +2735,7 @@ Summary of operations based on inputs (name arg from \\='hbut:current attrs):
('annot-bib (insert "[" arg1 "]"))
('exec-shell-cmd (insert "\"!" arg1 "\""))
('exec-window-cmd (insert "\"&" arg1 "\""))
('link-to-denote (insert "\"" arg1 "\""))
('link-to-gbut (insert "<glink:" arg1 ">"))
('link-to-ebut (progn (insert "<elink:" arg1)
(when arg2 (insert ": " arg2))
Expand Down
Loading