branch: elpa/hyperdrive
commit b548bac48a8a19f1f3322b9c7d802a80d7f129e4
Author: Adam Porter <[email protected]>
Commit: Joseph Turner <[email protected]>
Change: (h/gateway-live-p) Rename from h//gateway-live-p
---
hyperdrive-lib.el | 16 ++++++++--------
hyperdrive-menu.el | 2 +-
hyperdrive-vars.el | 4 ++--
hyperdrive.el | 4 ++--
4 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/hyperdrive-lib.el b/hyperdrive-lib.el
index 1607abcf2e..74fe9c35f0 100644
--- a/hyperdrive-lib.el
+++ b/hyperdrive-lib.el
@@ -1412,11 +1412,11 @@ Then calls THEN if given."
"Start the gateway as an Emacs subprocess.
Default function; see variable `h/gateway-start-function'."
(cond ((and (h//gateway-ready-p)
- (h//gateway-live-p))
+ (h/gateway-live-p))
(h/error "Gateway already running"))
((h//gateway-ready-p)
(h/error "Gateway already running outside of Emacs"))
- ((h//gateway-live-p)
+ ((h/gateway-live-p)
(h/error "Gateway already starting")))
(let ((hyper-gateway-ushin-path
(or (h//hyper-gateway-ushin-path)
@@ -1443,12 +1443,12 @@ Default function; see variable
`h/gateway-start-function'."
(defun h//gateway-stop-default ()
"Stop the gateway subprocess."
- (unless (h//gateway-live-p)
+ (unless (h/gateway-live-p)
;; NOTE: We do not try to stop the process if we didn't start it ourselves.
(h/error "Gateway not running as subprocess"))
(interrupt-process h/gateway-process)
(with-timeout (4 (h/error "Gateway still running"))
- (cl-loop while (h//gateway-live-p)
+ (cl-loop while (h/gateway-live-p)
do (sleep-for 0.2)))
;; TODO: Consider killing the process buffer and setting the variable nil in
;; the sentinel.
@@ -1456,7 +1456,7 @@ Default function; see variable
`h/gateway-start-function'."
(setf h/gateway-process nil)
(h/message "Gateway stopped."))
-(defun h//gateway-live-p ()
+(defun h/gateway-live-p ()
"Return non-nil if the gateway process is running.
Calls function set in option `hyperdrive-gateway-live-predicate'.
This does not mean that the gateway is responsive, only that the
@@ -1464,7 +1464,7 @@ process is running. See also function
`hyperdrive--gateway-ready-p'."
(funcall h/gateway-live-predicate))
-(defun h//gateway-live-p-default ()
+(defun h/gateway-live-p-default ()
"Return non-nil if the gateway process is running.
This does not mean that the gateway is responsive, only that the
process is running. See also function
@@ -1486,9 +1486,9 @@ Or if gateway isn't ready within timeout, show an error."
(check
(lambda ()
;; FIXME: Double-check this behavior. Is the timer running multiple
times?
- (cond ((and (h//gateway-live-p) (h//gateway-ready-p))
+ (cond ((and (h/gateway-live-p) (h//gateway-ready-p))
;; FIXME: If the gateway is already running outside of Emacs,
- ;; will `h//gateway-live-p' return non-nil if `check' runs
+ ;; will `h/gateway-live-p' return non-nil if `check' runs
;; before the subprocess dies with an error?
(run-hooks 'h/gateway-ready-hook))
((h//gateway-ready-p)
diff --git a/hyperdrive-menu.el b/hyperdrive-menu.el
index 5de6c155d5..87b2eb7164 100644
--- a/hyperdrive-menu.el
+++ b/hyperdrive-menu.el
@@ -207,7 +207,7 @@
(concat (propertize "Gateway: " 'face 'transient-heading)
(propertize
(cond ((h//gateway-ready-p) "on")
- ((h//gateway-live-p) "starting")
+ ((h/gateway-live-p) "starting")
(t "off"))
'face 'transient-value)))
("G s" "Start" h/start
diff --git a/hyperdrive-vars.el b/hyperdrive-vars.el
index 4808fccba9..89dc33e22c 100644
--- a/hyperdrive-vars.el
+++ b/hyperdrive-vars.el
@@ -419,8 +419,8 @@ This function should signal an error if it fails to stop the
gateway process."
:type 'function)
-(declare-function h//gateway-live-p-default "hyperdrive-lib")
-(defcustom h/gateway-live-predicate #'h//gateway-live-p-default
+(declare-function h/gateway-live-p-default "hyperdrive-lib")
+(defcustom h/gateway-live-predicate #'h/gateway-live-p-default
"Predicate function which returns non-nil if the gateway process is live."
:type 'function)
diff --git a/hyperdrive.el b/hyperdrive.el
index 5aaacb4a77..aff3112b9a 100644
--- a/hyperdrive.el
+++ b/hyperdrive.el
@@ -1341,7 +1341,7 @@ gateway version."
(rename-file file-name destination-name)
(chmod destination-name #o755))
(setf h/install-in-progress-p nil)
- (cond ((h//gateway-live-p)
+ (cond ((h/gateway-live-p)
;; Gateway running inside of Emacs: prompt to restart it.
(when (yes-or-no-p "Installed hyper-gateway-ushin. Restart
gateway?")
(h/restart)))
@@ -1361,7 +1361,7 @@ gateway version."
;; TODO: Just start the gateway if it's already stopped?
(h/stop)
(with-timeout (5 (h/message "Timed out waiting for gateway to stop"))
- (cl-loop while (h//gateway-live-p)
+ (cl-loop while (h/gateway-live-p)
do (sleep-for 0.2)))
(h/start))
