branch: scratch/hyperbole
commit c10536751abe331273c3d0acf8ba2f0d09cfb22a
Author: Stefan Monnier <monn...@iro.umontreal.ca>
Commit: Stefan Monnier <monn...@iro.umontreal.ca>
hyperbole-autoloads.el: Remove needless definitions
* hversion.el (hyperb:mouse-buttons):
* hload-path.el (hyperb:microsoft-os-p, hyperb:wsl-os-p): Don't
needlessly predefine internal variables.
(load-path): Don't add `test` to the `load-path`.
---
hload-path.el | 8 +++++---
hversion.el | 2 +-
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/hload-path.el b/hload-path.el
index c6d2f0814d..d02ce7fef4 100644
--- a/hload-path.el
+++ b/hload-path.el
@@ -25,14 +25,14 @@
;;; Public variables
;;; ************************************************************************
-;;;###autoload
+
(defvar hyperb:microsoft-os-p
(memq system-type '(ms-windows windows-nt ms-dos win32))
"Non-nil iff Hyperbole is running under a Microsoft OS but not for WSL.
WSL is Windows Subsystem for Linux.
Use `hyperb:wsl-os-p' to test if running under WSL.")
-;;;###autoload
+
(defvar hyperb:wsl-os-p
(and (eq system-type 'gnu/linux) (executable-find "wsl.exe") t)
"T iff Hyperbole is running under Microsoft Windows Subsystem for Linux
(WSL).")
@@ -72,7 +72,9 @@ Valid values end with a directory separator character.")
;;; Hyperbole test importation settings
;;; ************************************************************************
-(add-to-list 'load-path (expand-file-name "test" hyperb:dir))
+;; FIXME: This should be done only when running the tests, not in
+;; normal sessions.
+;;(add-to-list 'load-path (expand-file-name "test" hyperb:dir))
;; Ensure final name (after resolving all links) of hyperb:dir is
;; used after setting up load-path; otherwise, Hyperbole may fail
diff --git a/hversion.el b/hversion.el
index 73430838f0..d9445717e0 100644
--- a/hversion.el
+++ b/hversion.el
@@ -28,7 +28,7 @@
(defconst hyperb:version "8.0.1pre" "GNU Hyperbole revision number.")
-;;;###autoload
+
(defvar hyperb:mouse-buttons
(if (or (and hyperb:microsoft-os-p (not (memq window-system '(w32 w64 x))))
(memq window-system '(ns dps)))
