[nongnu] elpa/hyperdrive e640a14d84 067/102: Change: (hyperdrive-{message, error}) Call substitute-command-keys

[ELPA Syncer]

branch: elpa/hyperdrive
commit e640a14d84569cbba0feb9c429bd737724d1f9f9
Author: Joseph Turner <joseph@ushin.org>
Commit: Joseph Turner <joseph@ushin.org>

    Change: (hyperdrive-{message,error}) Call substitute-command-keys
---
 hyperdrive-dir.el |  3 +--
 hyperdrive-lib.el |  9 +++++----
 hyperdrive.el     | 10 ++++------
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/hyperdrive-dir.el b/hyperdrive-dir.el
index 706f699e0a..a2e0a24981 100644
--- a/hyperdrive-dir.el
+++ b/hyperdrive-dir.el
@@ -327,8 +327,7 @@ Interactively, opens file or directory at point in
 (defun hyperdrive-create-directory-no-op ()
   "Signal error that directory creation is not possible in hyperdrive."
   (interactive)
-  (hyperdrive-user-error
-   (substitute-command-keys "Cannot create empty directory; to create a new 
file, use `hyperdrive-find-file' or \\[hyperdrive-find-file]")))
+  (hyperdrive-user-error "Cannot create empty directory; to create a new file, 
use `hyperdrive-find-file' or \\[hyperdrive-find-file]"))
 
 (defun hyperdrive-dir-sort (directory-sort)
   "Sort current `hyperdrive-dir' buffer by DIRECTORY-SORT.
diff --git a/hyperdrive-lib.el b/hyperdrive-lib.el
index 2ee012269e..b2f9fbc4e6 100644
--- a/hyperdrive-lib.el
+++ b/hyperdrive-lib.el
@@ -209,8 +209,7 @@ PLZ-ERR should be a `plz-error' struct."
   (pcase plz-err
     ((app plz-error-curl-error `(7 . ,_message))
      ;; Curl error 7 is "Failed to connect to host."
-     (hyperdrive-user-error (substitute-command-keys
-                             "Gateway not running.  Use \\[hyperdrive-start] 
to start it")))
+     (hyperdrive-user-error "Gateway not running.  Use \\[hyperdrive-start] to 
start it"))
     ((app plz-error-response (cl-struct plz-response (status (or 403 405)) 
body))
      ;; 403 Forbidden or 405 Method Not Allowed: Display message from 
hyper-gateway.
      (hyperdrive-error "%s" body))
@@ -1411,11 +1410,13 @@ according to FORMATS, by default `hyperdrive-formats', 
which see."
 
 (defun hyperdrive-message (message &rest args)
   "Call `message' with MESSAGE and ARGS, prefixing MESSAGE with 
\"Hyperdrive:\"."
-  (apply #'message (concat "Hyperdrive: " message) args))
+  (apply #'message
+         (concat "Hyperdrive: " (substitute-command-keys message)) args))
 
 (defun hyperdrive-user-error (format &rest args)
   "Call `user-error' with FORMAT and ARGS, prefixing FORMAT with 
\"Hyperdrive:\"."
-  (apply #'user-error (concat "Hyperdrive: " format) args))
+  (apply #'user-error
+         (concat "Hyperdrive: " (substitute-command-keys format)) args))
 
 (defun hyperdrive-insert-button (text &rest properties)
   "Insert button labeled TEXT with button PROPERTIES at point.
diff --git a/hyperdrive.el b/hyperdrive.el
index 0c3ae818b4..deb406781b 100644
--- a/hyperdrive.el
+++ b/hyperdrive.el
@@ -557,7 +557,7 @@ it to `hyperdrive-open'."
   (interactive (list hyperdrive-current-entry))
   (if-let ((previous-entry (hyperdrive-entry-previous entry)))
       (hyperdrive-open previous-entry)
-    (hyperdrive-message (substitute-command-keys "%s does not exist at version 
%s. Try \\[hyperdrive-history]")
+    (hyperdrive-message "%s does not exist at version %s. Try 
\\[hyperdrive-history]"
                         (hyperdrive--format-entry entry "[%H] %p")
                         (1- (car (hyperdrive-entry-version-range entry))))))
 
@@ -576,11 +576,9 @@ it to `hyperdrive-open'."
            "\\[revert-buffer-quick]"
          "\\[revert-buffer]"))))
     ('nil ;; Known nonexistent: suggest `hyperdrive-history'.
-     (hyperdrive-message (substitute-command-keys
-                          "Entry deleted after this version. Try 
\\[hyperdrive-history]")))
+     (hyperdrive-message "Entry deleted after this version. Try 
\\[hyperdrive-history]"))
     ('unknown ;; Unknown existence: suggest `hyperdrive-history'.
-     (hyperdrive-message (substitute-command-keys
-                          "Next version unknown. Try \\[hyperdrive-history]")))
+     (hyperdrive-message "Next version unknown. Try \\[hyperdrive-history]"))
     ((and (pred hyperdrive-entry-p) next-entry)
      (hyperdrive-open next-entry))))
 
@@ -595,7 +593,7 @@ Nil VERSION means open the entry at its hyperdrive's latest 
version."
                                                       
(hyperdrive--format-entry entry))))))
   (if-let ((latest-entry (hyperdrive-entry-at version entry)))
       (hyperdrive-open latest-entry)
-    (hyperdrive-message (substitute-command-keys "%s does not exist at version 
%s. Try \\[hyperdrive-history]")
+    (hyperdrive-message "%s does not exist at version %s. Try 
\\[hyperdrive-history]"
                         (hyperdrive--format-entry
                          entry hyperdrive-default-entry-format-without-version)
                         version)))