branch: scratch/hyperbole
commit bfe7ef167de6371e12c7466671389d56ba77f928
Author: Stefan Monnier <monn...@iro.umontreal.ca>
Commit: Stefan Monnier <monn...@iro.umontreal.ca>
* hversion.el (hyperb:path-being-loaded): Delete function
* hload-path.el (hyperb:dir): Don't use it as fallback because it's too
hackish and too rarely useful.
---
hload-path.el | 1 -
hversion.el | 27 ---------------------------
hyperbole.el | 6 +++---
3 files changed, 3 insertions(+), 31 deletions(-)
diff --git a/hload-path.el b/hload-path.el
index 1b418e79f5..c6d2f0814d 100644
--- a/hload-path.el
+++ b/hload-path.el
@@ -46,7 +46,6 @@ Use `hyperb:wsl-os-p' to test if running under WSL.")
(macroexp-file-name)
(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"))
diff --git a/hversion.el b/hversion.el
index 5896e38677..72c6c97f7e 100644
--- a/hversion.el
+++ b/hversion.el
@@ -93,33 +93,6 @@ of stack frames (from innermost to outermost)."
nil)
(if debug-flag (nreverse frame-list)))))
-(defun hyperb:path-being-loaded ()
- "Return the full pathname used by the innermost `load' or `require' call.
-Removes any matches for `hyperb:automount-prefixes' before returning
-the pathname."
- (let* ((frame (hyperb:stack-frame '(load require)))
- (function (nth 1 frame))
- file nosuffix)
- (cond ((eq function 'load)
- (setq file (nth 2 frame)
- nosuffix (nth 5 frame)))
- ((eq function 'require)
- (setq file (or (nth 3 frame) (symbol-name (nth 2 frame))))))
- (if (stringp file)
- (setq nosuffix (or nosuffix
- (string-match
- "\\.\\(elc?\\|elc?\\.gz\\|elc?\\.Z\\)$"
- file))
- file (substitute-in-file-name file)
- file (locate-file file load-path
- (if (null nosuffix) '(".elc" ".el" ".el.gz"
".el.Z"))
- ;; accept any existing file
- nil)
- file (if (and (stringp file)
- (string-match hyperb:automount-prefixes file))
- (substring file (1- (match-end 0)))
- file)))))
-
(defun hyperb:window-sys-term (&optional frame)
"Return first part of the term-type if running under a window system, else
nil.
Where a part in the term-type is delimited by a `-' or an `_'."
diff --git a/hyperbole.el b/hyperbole.el
index f270cfc165..7286fa7dce 100644
--- a/hyperbole.el
+++ b/hyperbole.el
@@ -113,9 +113,9 @@
(setq features (delq 'hload-path features)
features (delq 'hversion features)))
- ;; Defines hyperb:path-being-loaded, hyperb:stack-frame,
- ;; (hyperb:window-system) and hyperb:dir, which are used later in
- ;; this file. Also adds Hyperbole to the load-path if need be.
+ ;; Defines hyperb:stack-frame, (hyperb:window-system), and hyperb:dir,
+ ;; which are used later in this file.
+ ;; Also adds Hyperbole to the load-path if need be.
;;
;; This handles the case when the Hyperbole package directory is not yet in
load-path.
(unless (or (require 'hversion nil t)
