branch: elpa/hyperdrive
commit 8928f52d5844baa5ba00f5191a4361e70d7a05f3
Author: Joseph Turner <[email protected]>
Commit: Joseph Turner <[email protected]>
Change: Use h/gateway-installing-p everywhere appropriate
---
hyperdrive-menu.el | 6 +++---
hyperdrive.el | 7 +++----
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/hyperdrive-menu.el b/hyperdrive-menu.el
index 43c5dc5042..a073631ec5 100644
--- a/hyperdrive-menu.el
+++ b/hyperdrive-menu.el
@@ -208,9 +208,9 @@
(propertize
(cond ((h//gateway-ready-p) "on")
((h/gateway-live-p) "starting")
- ((and (h/gateway-installed-p) h/install-in-progress)
+ ((and (h/gateway-installed-p) (h/gateway-installing-p))
"upgrading")
- (h/install-in-progress "installing")
+ ((h/gateway-installing-p) "installing")
((h/gateway-installed-p) "off")
(t "not found"))
'face 'transient-value)))
@@ -238,7 +238,7 @@
((h/gateway-installed-p) "Reinstall")
(t "Install")))
:transient t
- :inapt-if-non-nil hyperdrive-install-in-progress)]
+ :inapt-if h/gateway-installing-p)]
["Bookmark"
("b j" "Jump" h/bookmark-jump)
("b l" "List" h/bookmark-list)
diff --git a/hyperdrive.el b/hyperdrive.el
index 7a6c33c931..27826ec4c9 100644
--- a/hyperdrive.el
+++ b/hyperdrive.el
@@ -106,14 +106,13 @@ which see."
(h/message "Gateway already running outside of Emacs."))
((h/gateway-live-p)
(h/message "Gateway already starting."))
- ((and (not gateway-installed-p)
- (process-live-p h/install-in-progress))
+ ((and (not gateway-installed-p) (h/gateway-installing-p))
(h/user-error "Gateway installation in-progress"))
((not gateway-installed-p)
(h/user-error "Gateway not installed; try \\[hyperdrive-install]"))
(t
(h/message
- (if hyperdrive-install-in-progress
+ (if (h/gateway-installing-p)
"Gateway installation in-progress; starting old gateway
anyway."
"Starting gateway."))
(funcall h/gateway-start-function))))
@@ -1301,7 +1300,7 @@ Intended for relative (i.e. non-full) URLs."
"Download and install hyper-gateway-ushin.
If FORCEP, don't prompt for confirmation before downloading."
(interactive (list current-prefix-arg))
- (when (process-live-p h/install-in-progress)
+ (when (h/gateway-installing-p)
(h/error "Installation of gateway already in progress"))
(unless forcep
(when (h/gateway-installed-p)
