branch: externals/hyperbole
commit 24985daca0b1c903ffc275f6d8af49f8acd13498
Merge: 7caaff7ba7a 01dc5f4023f
Author: Robert Weiner <[email protected]>
Commit: GitHub <[email protected]>
Merge pull request #1001 from rswgnu/rsw
hkey-alist - Fix point comparison bug in hui-select-thing/sexp and a few
other small bugs
---
ChangeLog | 15 +++++++++++++++
hpath.el | 4 ++--
hywiki.el | 6 ++++--
man/hyperbole.html | 6 +++---
man/hyperbole.info | Bin 690591 -> 690583 bytes
man/hyperbole.pdf | Bin 1724505 -> 1724505 bytes
man/hyperbole.texi | 10 +++++-----
7 files changed, 29 insertions(+), 12 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 5f54007b877..7e6f1caf115 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2026-07-07 Bob Weiner <[email protected]>
+
+* hui-mouse.el (hkey-alist): Trigger 'hui-select-thing' or
'hui-select-mark-delimited-sexp'
+ if (point) >= any hbut end point, not just equal to it, as before. This
was causing
+ a failure to trigger when a HyWikiWord came right before a closing double
quote that
+ point was on, so the double quoted string was not selected and the
HyWikiWord was
+ activated instead.
+
2026-07-06 Bob Weiner <[email protected]>
* man/hyperbole.texi (HyWiki): Finish HyWiki manual chapter.
@@ -5,6 +13,13 @@
Elpa Stable given long full release cycles.
(Installation): Add optional (hywiki-mode :all) config.
+* hywiki.el (hywiki--extend-region): Fix so start is always <= end.
+
+ (hywiki-get-existing-page-file): Handle 't' value as
'file-stem-name'
+ from a HyWikiWord spec.
+ hpath.el (hpath:expand): Ensure path value is a string before trying to
expand
+ to handle HyWikiWord specs.
+
2026-07-04 Bob Weiner <[email protected]>
* hycontrol.el (hycontrol-frame-zoom-reset): Handle 'frame not zoomed'
diff --git a/hpath.el b/hpath.el
index b8bfb35e8a5..7c63fa43cf0 100644
--- a/hpath.el
+++ b/hpath.el
@@ -3,7 +3,7 @@
;; Author: Bob Weiner
;;
;; Orig-Date: 1-Nov-91 at 00:44:23
-;; Last-Mod: 28-Jun-26 at 16:52:07 by Bob Weiner
+;; Last-Mod: 5-Jul-26 at 13:09:03 by Bob Weiner
;;
;; SPDX-License-Identifier: GPL-3.0-or-later
;;
@@ -1295,7 +1295,7 @@ original path."
((and (null (file-name-directory substituted-path))
;; Could be an existing HyWikiWord
(let ((page-file (cdr (hywiki-get-referent
substituted-path))))
- (when page-file
+ (when (stringp page-file)
(setq substituted-path (expand-file-name page-file
hywiki-directory))))))
(t (expand-file-name substituted-path))))
(if exists-flag
diff --git a/hywiki.el b/hywiki.el
index 97a1d019c28..8f64e9aa480 100644
--- a/hywiki.el
+++ b/hywiki.el
@@ -3085,7 +3085,9 @@ FILE-STEM-NAME should not contain a directory and may
have or may omit
Checks only that FILE-STEM-NAME is not nil, not an empty string and does
not contain a directory path or returns nil."
(make-directory hywiki-directory t)
- (unless (or (null file-stem-name) (string-empty-p file-stem-name)
+ (unless (or (null file-stem-name)
+ (eq file-stem-name t) ;; HyWikiWord spec
+ (string-empty-p file-stem-name)
(file-name-directory file-stem-name))
(let (file-name
referent
@@ -4643,7 +4645,7 @@ delimiters."
(skip-chars-backward " \t\n\r")
(skip-syntax-forward "w")
(setq end (point)))
- (setq result (list start end)))
+ (setq result (list (min start end) (max start end))))
result))
(defun hywiki--get-all-references (function &optional start end)
diff --git a/man/hyperbole.html b/man/hyperbole.html
index 4b6874ec119..5c02d16499a 100644
--- a/man/hyperbole.html
+++ b/man/hyperbole.html
@@ -10046,7 +10046,7 @@ you have GNU Emacs set up at your site. Choose one
based on your needs.
<div class="subsection-level-extent"
id="Elpa-In_002dDevelopment-Package-Installation">
<div class="nav-panel">
<p>
-Next: <a href="#Git-In_002dDevelopment-Package-Installation" accesskey="n"
rel="next">Git In-Development Package Installation (Straight Package
Manager)</a>, Previous: <a href="#Elpa-Stable-Package-Installation"
accesskey="p" rel="prev">Elpa Stable Package Installation (Emacs Package
Manager)</a>, Up: <a href="#Installation" accesskey="u"
rel="up">Installation</a> [<a href="#SEC_Contents" title="Table of
contents" rel="contents">Contents</a>][<a href="#Key-Index" title="Index" rel
[...]
+Next: <a href="#Elpa-Stable-Package-Installation" accesskey="n"
rel="next">Elpa Stable Package Installation (Emacs Package Manager)</a>,
Previous: <a href="#Installation" accesskey="p" rel="prev">Installation</a>,
Up: <a href="#Installation" accesskey="u" rel="up">Installation</a> [<a
href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a
href="#Key-Index" title="Index" rel="index">Index</a>]</p>
</div>
<h4 class="subsection"
id="Elpa-In_002dDevelopment-Package-Installation-1"><span>B.1.1 Elpa
In-Development Package Installation<a class="copiable-link"
href="#Elpa-In_002dDevelopment-Package-Installation-1"> ¶</a></span></h4>
@@ -10103,7 +10103,7 @@ ignored.
<div class="subsection-level-extent" id="Elpa-Stable-Package-Installation">
<div class="nav-panel">
<p>
-Next: <a href="#Elpa-In_002dDevelopment-Package-Installation" accesskey="n"
rel="next">Elpa In-Development Package Installation</a>, Previous: <a
href="#Installation" accesskey="p" rel="prev">Installation</a>, Up: <a
href="#Installation" accesskey="u" rel="up">Installation</a> [<a
href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a
href="#Key-Index" title="Index" rel="index">Index</a>]</p>
+Next: <a href="#Git-In_002dDevelopment-Package-Installation" accesskey="n"
rel="next">Git In-Development Package Installation (Straight Package
Manager)</a>, Previous: <a href="#Elpa-In_002dDevelopment-Package-Installation"
accesskey="p" rel="prev">Elpa In-Development Package Installation</a>, Up: <a
href="#Installation" accesskey="u" rel="up">Installation</a> [<a
href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a
href="#Key-Index" title="Index" rel="in [...]
</div>
<h4 class="subsection"
id="Elpa-Stable-Package-Installation-_0028Emacs-Package-Manager_0029"><span>B.1.2
Elpa Stable Package Installation (Emacs Package Manager)<a
class="copiable-link"
href="#Elpa-Stable-Package-Installation-_0028Emacs-Package-Manager_0029">
¶</a></span></h4>
@@ -10158,7 +10158,7 @@ ignored.
<div class="subsection-level-extent"
id="Git-In_002dDevelopment-Package-Installation">
<div class="nav-panel">
<p>
-Next: <a href="#Manual-Tarball-Archive-Installation" accesskey="n"
rel="next">Manual Tarball Archive Installation</a>, Previous: <a
href="#Elpa-In_002dDevelopment-Package-Installation" accesskey="p"
rel="prev">Elpa In-Development Package Installation</a>, Up: <a
href="#Installation" accesskey="u" rel="up">Installation</a> [<a
href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a
href="#Key-Index" title="Index" rel="index">Index</a>]</p>
+Next: <a href="#Manual-Tarball-Archive-Installation" accesskey="n"
rel="next">Manual Tarball Archive Installation</a>, Previous: <a
href="#Elpa-Stable-Package-Installation" accesskey="p" rel="prev">Elpa Stable
Package Installation (Emacs Package Manager)</a>, Up: <a href="#Installation"
accesskey="u" rel="up">Installation</a> [<a href="#SEC_Contents"
title="Table of contents" rel="contents">Contents</a>][<a href="#Key-Index"
title="Index" rel="index">Index</a>]</p>
</div>
<h4 class="subsection"
id="Git-In_002dDevelopment-Package-Installation-_0028Straight-Package-Manager_0029"><span>B.1.3
Git In-Development Package Installation (Straight Package Manager)<a
class="copiable-link"
href="#Git-In_002dDevelopment-Package-Installation-_0028Straight-Package-Manager_0029">
¶</a></span></h4>
diff --git a/man/hyperbole.info b/man/hyperbole.info
index b44ad088b9f..4704340c260 100644
Binary files a/man/hyperbole.info and b/man/hyperbole.info differ
diff --git a/man/hyperbole.pdf b/man/hyperbole.pdf
index fae0cd96954..ac0bb63ac00 100644
Binary files a/man/hyperbole.pdf and b/man/hyperbole.pdf differ
diff --git a/man/hyperbole.texi b/man/hyperbole.texi
index 9eb07880a5c..ed4709706cf 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: 6-Jul-26 at 21:14:36 by Bob Weiner
+@c Last-Mod: 6-Jul-26 at 22:32:48 by Bob Weiner
@c %**start of header (This is for running Texinfo on a region.)
@setfilename hyperbole.info
@@ -452,8 +452,8 @@ Setup
Installation
-* Elpa Stable Package Installation::
* Elpa In-Development Package Installation::
+* Elpa Stable Package Installation::
* Git In-Development Package Installation::
* Manual Tarball Archive Installation::
@@ -9064,7 +9064,7 @@ you have GNU Emacs set up at your site. Choose one based
on your needs.
@noindent
After installing Hyperbole, read the next section on Invocation.
-@node Elpa In-Development Package Installation, Git In-Development Package
Installation, Elpa Stable Package Installation, Installation
+@node Elpa In-Development Package Installation, Elpa Stable Package
Installation, Installation, Installation
@subsection Elpa In-Development Package Installation
@cindex elpa-devel package
@@ -9118,7 +9118,7 @@ and compiled for use with your version of Emacs; give it
a minute or two.
You may see a bunch of compilation warnings but these can be safely
ignored.
-@node Elpa Stable Package Installation, Elpa In-Development Package
Installation, Installation, Installation
+@node Elpa Stable Package Installation, Git In-Development Package
Installation, Elpa In-Development Package Installation, Installation
@subsection Elpa Stable Package Installation (Emacs Package Manager)
@cindex installation
@@ -9170,7 +9170,7 @@ and compiled for use with your version of Emacs; give it
a minute or two.
You may see a bunch of compilation warnings but these can be safely
ignored.
-@node Git In-Development Package Installation, Manual Tarball Archive
Installation, Elpa In-Development Package Installation, Installation
+@node Git In-Development Package Installation, Manual Tarball Archive
Installation, Elpa Stable Package Installation, Installation
@subsection Git In-Development Package Installation (Straight Package Manager)
@cindex Straight package manager
