From af5baa21e3a554e0aeed70efa7b37c997b9a9998 Mon Sep 17 00:00:00 2001 From: bw Date: Tue, 7 Jul 2026 02:11:26 -0400 Subject: [PATCH 1/2] hkey-alist - Fix point comparison bug in hui-select-thing/sexp hywiki-get-existing-page-file, hpath:expand - Fix to not expand HyWikiWord spec value of 't' when given. hywiki--extend-region - Fix so start is always <= end. --- ChangeLog | 15 +++++++++++++++ hpath.el | 4 ++-- hywiki.el | 6 ++++-- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5f54007b..7e6f1caf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2026-07-07 Bob Weiner + +* 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 * 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 * hycontrol.el (hycontrol-frame-zoom-reset): Handle 'frame not zoomed' diff --git a/hpath.el b/hpath.el index b8bfb35e..7c63fa43 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 97a1d019..8f64e9aa 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) From 58a4b0acbc56a90896b518410c7ea7e74625ed4f Mon Sep 17 00:00:00 2001 From: bw Date: Tue, 7 Jul 2026 02:22:09 -0400 Subject: [PATCH 2/2] man/hyperbole.texi - Fix 'Elpa Stable Package Installation' menu pos --- man/hyperbole.html | 6 +++--- man/hyperbole.info | Bin 690591 -> 690583 bytes man/hyperbole.pdf | Bin 1724505 -> 1724505 bytes man/hyperbole.texi | 10 +++++----- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/man/hyperbole.html b/man/hyperbole.html index 4b6874ec..5c02d164 100644 --- a/man/hyperbole.html +++ b/man/hyperbole.html @@ -10046,7 +10046,7 @@

B.1 Installation

-Next: , Previous: , Up: Installation   [Contents][Index]

+Next: , Previous: , Up: Installation   [Contents][Index]

B.1.1 Elpa In-Development Package Installation

@@ -10103,7 +10103,7 @@

-Next: , Previous: , Up: Installation   [Contents][Index]

+Next: , Previous: , Up: Installation   [Contents][Index]

B.1.2 Elpa Stable Package Installation (Emacs Package Manager)

@@ -10158,7 +10158,7 @@

-Next: , Previous: , Up: Installation   [Contents][Index]

+Next: , Previous: , Up: Installation   [Contents][Index]

B.1.3 Git In-Development Package Installation (Straight Package Manager)

diff --git a/man/hyperbole.info b/man/hyperbole.info index b44ad088b9ff5534f935b97edd973b460d15b974..4704340c26078b10cac1ea7adec730d6e6f5a26e 100644 GIT binary patch delta 1557 zcmYLIO-x-y6b|>@x$iNheNY~+B*Y2uYs=4Ls9= z0owOdX!}HCsd6O;|`mbit|=7cOjKQeD-Rb!oaFp1F6Zi&@NfzBAu< ze&%|u7iztCZgjvmH|>@AfzIkcXB{33Phx$b)2>~CkM7!}cB7+xY0a*Oo^88%-CeW$ zQ}EzBTj;bSaBSO70)hwEx9-~GNjR`(^J-zk#zXKpc#?Qh>xGSaZ!_Ub3ip1rUxZ)I zQPCeNMu!Tg^L@G3rp`_l#>ZwyCdUdBW#8jMN&05~{l47T_{eC!Z!ezD4dy4NG$CY) z!j)g`Yzl9IV1mM(-|TD>Z&HLlRL;}qEXLv6^Ry!&PQ?Faaz{{;=tktY0z}(aT&vv3#eb(BKtHPa^JwqTcjEK zFHlnF!Ab>vZf?h!O7d6;F!PAznaeY8C)4;sh<*Pbap39>AsS|E&pq0p&^SklR; zgf#q14kDslr6Ow?=%1&J3168~Z{JGlo+u_w3t@4W;9%ydV;-$7_vj`op}6r}Y;vL; ztk$T!)a2~L!73>vjOd2F+vM!mNm!Rj8oEf^_H4e=>O`hgz>JMzr{-f#IGfn`&PAHB z@FPW4-0yZWI*h$EqksH@gOzfZ2Z2FOUBbSJSbkVKS-5)XX$|n1bPj2{ROm2za_D=~ z>>z?`9QC?3@vN5cT;UqWw_cAtc^+;|oU=I?iF!Ct<1$*H&o9%o#S{!zXbUV4It{RS z8AmM5?(Ke^+)wc3z=P|^SgO+IM4*i8m&bH3xu;Ytl7UlI+5|t~5&+7jpj4%f_0;sV zgR|hw_j#PZH0@+yr;2K!QM)%2d1Tz@23agRxZj-dFkZt9{CzH}j0wi0CCWg-aAdHz zR>#KlPIDGA9Q(CT=usM?NAtJ;+^)~&%G_rzH{U%sFf}=KCZBt!aOOh{NZrM{1$yZ4 lUi?IUCU<<|bbh+bdBB+fcY(H9_+Q>wpskirFuFj){{S9;(?I|L delta 1505 zcmYLJUrZcD7!P~9dwbI&|DlvZuQk+4f|=Qw-Ptj`XcLU7)+m^$4+Yb1kp%A$js)en zqXk=96Ez{}=bP1-Y6uY?NO+(L_61F}T1|YlJorlMgNgBl`pxcKe3-kP-}imL@9%uD z()amF-^T4@aB0`;f=8>i1Hb5>uUGBU@b{`cv^dy(ZLqrzkA)|*HP~&hdRsl(Wv0+Jy?F0#+fXEI))dE2P)2Q4Pn_rSZa8 zmGdx=zTrPxoGDF=7vib>+4y~Qz-1Up*r;HBfq-8tX&#S|ua_}nGyD$HbUZCB^9Ay+t%78_r>k_<=IW$hPBY1WU+Lolh1>u1=-jYYU{l zPQv6OI{0~kbXY-<3MO}*CT$i8VUUO4J1rQHj3OVJE~Ea9A5&ini=P^e-gA1;D5Ab^ zkPTF{`2QCd_I`I9t>gQ(m=7+K2Fs@@MbB)GXt6*)De~=~P9yq_LKdZdC$ErpEA&%o z|0^V?^`)Q@++8H?@L<((6C_e5$^GBFMvbVjhLrztnh{ZqQWIO_zfOIE2%O`jl;;;o zlb%Ps^w-LD+;ep?RiFZ@z4g`v2d(ZQEs#MZQuE_Wq#4*1(gxK|w^hq99tCeNkv@wX z7q?Ky@=YfDPrD7-s-R5bi%BB*Yl(DP-1M>ML(*nRb6J-zW`v>2(71aj-FA&gE=<vTD@Hp^r z#00}fYkc<%yN8jNi6BZRX?w`6*Fea^v}NZ;liZk;)MRkLa|w%5#^*|*7aJgapQ2F` zE(U?EMMTyTcrcShj;%-Uk z2iEoY3S`I0NstOkGXXA*KR$9#cqqc%77(}#ZWk(YpNa_fmPyA^M$MCdExr^_#f1y; zbX5qSDxA>kq)lF7M2#)7Pc1l7LFFq7OocV7M>Q~7QPn#7J(MQ7NHj57LgXw z7O@ub7Ks+gEmE)LS&fX1OpT|1ke8B!Ft-aUNM$iQyBN3`S{Pe8yIMF}n3|ip85x+F cnHjjc89SOgn>ZRc+bP%(QnLMkveZl+0FrnseEF7M2#)7Pc1l7LFFq7OocV7M>Q~7QPn#7J(MQ7NHj57LgXw z7O@ub7Ks+gEmE)LSq%-%49us0ke8B!Ft-aUNM$iQTNpb#TAH|;xHua+yE?j