[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] scratch/hyperbole b5780234d9 02/16: * hversion.el (hyperb:path-be
From: |
Stefan Monnier |
Subject: |
[elpa] scratch/hyperbole b5780234d9 02/16: * hversion.el (hyperb:path-being-loaded): Delete function |
Date: |
Mon, 19 Jun 2023 22:36:44 -0400 (EDT) |
branch: scratch/hyperbole
commit b5780234d975041c75cdddc2be8668b2ceac7a58
Author: Stefan Monnier <monnier@iro.umontreal.ca>
Commit: Stefan Monnier <monnier@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 b71239b7a9..1b5e9dce58 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 45f4390bd6..6e11fa45de 100644
--- a/hversion.el
+++ b/hversion.el
@@ -93,33 +93,6 @@ of stack frames (from innermost to outermost)."
nil)
(when 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))))))
- (when (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
- (when (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)
- [elpa] branch scratch/hyperbole created (now a269d1536e), Stefan Monnier, 2023/06/19
- [elpa] scratch/hyperbole 5206d3b3d4 01/16: * hload-path.el (hyperb:dir): Use `macroexp-file-name`, Stefan Monnier, 2023/06/19
- [elpa] scratch/hyperbole 0bf8fd8eee 03/16: Try and avoid using `hyperb:stack-frame`, Stefan Monnier, 2023/06/19
- [elpa] scratch/hyperbole b5780234d9 02/16: * hversion.el (hyperb:path-being-loaded): Delete function,
Stefan Monnier <=
- [elpa] scratch/hyperbole 60cf4b3ab0 07/16: * hact.el: Fix broken lexical-binding cookie, Stefan Monnier, 2023/06/19
- [elpa] scratch/hyperbole 57d02f8456 09/16: hyperbole-autoloads.el: Remove needless definitions, Stefan Monnier, 2023/06/19
- [elpa] scratch/hyperbole 5aa8d7a577 10/16: * hycontrol.el (hycontrol-windows-mode-map): Don't autoload, Stefan Monnier, 2023/06/19
- [elpa] scratch/hyperbole fd3f79a9ee 15/16: * hargs.el (hargs:set-string-to-complete): Don't mess with windows, Stefan Monnier, 2023/06/19
- [elpa] scratch/hyperbole ab0338d714 05/16: Fix compilation of test file, Stefan Monnier, 2023/06/19
- [elpa] scratch/hyperbole 63e463172e 06/16: (kview:char-visible-p): Delete function, Stefan Monnier, 2023/06/19
- [elpa] scratch/hyperbole fbcfcc04a3 08/16: * hyperbole.el: Preload `kotl-autoloads`, Stefan Monnier, 2023/06/19
- [elpa] scratch/hyperbole fc7e33b5e5 11/16: * hui-select.el: Fix a few warnings and improve some docstrings, Stefan Monnier, 2023/06/19
- [elpa] scratch/hyperbole 12fa8e328d 12/16: (man-show): Fix miscompilation, Stefan Monnier, 2023/06/19
- [elpa] scratch/hyperbole 10ac3f59df 13/16: Fix a few minor miscompilations and warnings, Stefan Monnier, 2023/06/19