branch: externals/hyperbole
commit ea30339ee9487b69e538580791ce7b6ef05b951c
Author: bw <[email protected]>
Commit: bw <[email protected]>
hsys-org-fix-version - Ensure 'org-install-dir' is a dir
hsys-org-log-and-fix-version - Ignore any version fixing errors due to
publishing incompatibilities between versions. Not relevant to run tests.
---
ChangeLog | 7 +++++++
hsys-org.el | 4 +++-
test/hy-test-dependencies.el | 7 ++++---
3 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index c6d365ebbc..559f7b0b5b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2026-02-14 Bob Weiner <[email protected]>
+* hsys-org.el (hsys-org-fix-version): Ensure 'org-install-dir' is a dir and
+ not the file found from 'find-library--from-load-history' call.
+
+* test/hy-test-dependencies.el (hsys-org-log-and-fix-version): Ignore any
version
+ fixing errors due to publishing incompatibilities between versions. Not
+ relevant to run tests.
+
* hywiki.el (hywiki--prior-mode): Rename to 'hywiki--prior-mode' since only
used internally.
(hywiki-mode): Define and document as a variable now that its
diff --git a/hsys-org.el b/hsys-org.el
index 8a6db8dc7f..4c473fb7c2 100644
--- a/hsys-org.el
+++ b/hsys-org.el
@@ -3,7 +3,7 @@
;; Author: Bob Weiner
;;
;; Orig-Date: 2-Jul-16 at 14:54:14
-;; Last-Mod: 31-Dec-25 at 00:03:26 by Mats Lidell
+;; Last-Mod: 14-Feb-26 at 23:40:17 by Bob Weiner
;;
;; SPDX-License-Identifier: GPL-3.0-or-later
;;
@@ -267,6 +267,8 @@ Return t if Org is reloaded, else nil."
;; Use the loadhist to get the path Org defs were loaded from
(org-install-dir
(ignore-errors (find-library--from-load-history "org-loaddefs"))))
+ (when org-install-dir
+ (setq org-install-dir (file-name-directory org-install-dir)))
(cond ((and org-dir org-install-dir (string-equal org-dir org-install-dir)
;; Still may have a situation where the Org version matches the
;; builtin Org but the directories are for a newer Org
diff --git a/test/hy-test-dependencies.el b/test/hy-test-dependencies.el
index e50ea65fbc..47207be4ae 100644
--- a/test/hy-test-dependencies.el
+++ b/test/hy-test-dependencies.el
@@ -3,7 +3,7 @@
;; Author: Mats Lidell <[email protected]>
;;
;; Orig-Date: 20-Feb-21 at 23:16:00
-;; Last-Mod: 25-Apr-25 at 19:28:36 by Mats Lidell
+;; Last-Mod: 14-Feb-26 at 23:46:04 by Bob Weiner
;;
;; SPDX-License-Identifier: GPL-3.0-or-later
;;
@@ -41,8 +41,9 @@
;; Needed when `hypb:display-file-with-logo' uses `org-mode'
(setq hsys-org-enable-smart-keys t)
-;; Log and fix any mixed version Org installation
-(hsys-org-log-and-fix-version)
+;; Log and fix any mixed version Org installation.
+;; Ignore publishing-related errors that don't affect the tests.
+(ignore-errors (hsys-org-log-and-fix-version))
(provide 'hy-test-dependencies)
;;; hy-test-dependencies.el ends here
