Skip to content

Use defvar for hyperb:dir #285

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
matsl merged 1 commit into from
Oct 20, 2022
Merged

Use defvar for hyperb:dir #285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions ChangeLog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
2022-10-20 Mats Lidell <matsl@gnu.org>

* hload-path.el (hyperb:dir): Use defvar. Thanks to Stefan Monnier.

2022-10-16 Mats Lidell <matsl@gnu.org>

* kotl/kview.el (kview:insert-contents): Don't use global name for
Expand Down
16 changes: 8 additions & 8 deletions hload-path.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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.")

Expand Down