branch: externals/hyperbole
commit c1c7b8acd969b000ec313f1d99be9879ffd0df8f
Author: Mats Lidell <mats.lid...@lidells.se>
Commit: GitHub <nore...@github.com>
Use defvar for hyperb:dir (#285)
---
ChangeLog | 4 ++++
hload-path.el | 16 ++++++++--------
2 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 0291e24e48..2a6d34c16d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2022-10-20 Mats Lidell <ma...@gnu.org>
+
+* hload-path.el (hyperb:dir): Use defvar. Thanks to Stefan Monnier.
+
2022-10-16 Mats Lidell <ma...@gnu.org>
* kotl/kview.el (kview:insert-contents): Don't use global name for
diff --git a/hload-path.el b/hload-path.el
index 259af2fa00..7fc8b40bca 100644
--- a/hload-path.el
+++ b/hload-path.el
@@ -3,7 +3,7 @@
;; Author: Bob Weiner
;;
;; Orig-Date: 29-Jun-16 at 14:39:33
-;; Last-Mod: 25-Jul-22 at 17:50:26 by Mats Lidell
+;; Last-Mod: 20-Oct-22 at 23:20:50 by Mats Lidell
;;
;; Copyright (C) 1992-2022 Free Software Foundation, Inc.
;; See the "HY-COPY" file for license information.
@@ -34,13 +34,13 @@ Use `hyperb:wsl-os-p' to test if running under WSL.")
;;; Hyperbole Directory Setting (dynamically computed)
;;; ************************************************************************
-(defconst hyperb:dir (or (file-name-directory
- (or (and (stringp load-file-name) load-file-name)
- (locate-file "hmouse-tag.el" load-path)
- (hyperb:path-being-loaded)
- ""))
- (error
- "(Hyperbole): Failed to set hyperb:dir. Try setting
it manually"))
+(defvar hyperb:dir (or (file-name-directory
+ (or (and (stringp load-file-name) load-file-name)
+ (locate-file "hmouse-tag.el" load-path)
+ (hyperb:path-being-loaded)
+ ""))
+ (error
+ "(Hyperbole): Failed to set hyperb:dir. Try setting it
manually"))
"Directory where the Hyperbole executable code is kept.
Valid values end with a directory separator character.")
