[nongnu] elpa/hyperdrive 8e591ae396 086/102: Tidy: Move applicable modes into interactive block

[ELPA Syncer]

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

    Tidy: Move applicable modes into interactive block
    
    Before we deprecated 27, this had to be accomplished inside `declare' 
blocks.
---
 hyperdrive-dir.el     | 16 ++++++++--------
 hyperdrive-ewoc.el    |  6 ++----
 hyperdrive-history.el | 18 ++++++------------
 hyperdrive-mirror.el  |  3 +--
 hyperdrive.el         | 20 ++++++++------------
 5 files changed, 25 insertions(+), 38 deletions(-)

diff --git a/hyperdrive-dir.el b/hyperdrive-dir.el
index 258ad974a8..87ba599943 100644
--- a/hyperdrive-dir.el
+++ b/hyperdrive-dir.el
@@ -276,9 +276,9 @@ With point on header, returns directory entry."
 Interactively, visit file or directory at point in
 `hyperdrive-dir' buffer.  DISPLAY-BUFFER-ACTION is passed to
 `pop-to-buffer'."
-  (declare (modes h/dir-mode))
   (interactive (list (or (h/dir--entry-at-point)
-                         (h/user-error "No file/directory at point"))))
+                         (h/user-error "No file/directory at point")))
+               h/dir-mode)
   (h/open entry
     :then (lambda ()
             (pop-to-buffer (current-buffer) display-buffer-action))))
@@ -287,9 +287,9 @@ Interactively, visit file or directory at point in
   "Visit hyperdrive ENTRY at point in other window.
 Interactively, visit file or directory at point in
 `hyperdrive-dir' buffer."
-  (declare (modes h/dir-mode))
   (interactive (list (or (h/dir--entry-at-point)
-                         (h/user-error "No file/directory at point"))))
+                         (h/user-error "No file/directory at point")))
+               h/dir-mode)
   (h/dir-find-file entry :display-buffer-action t))
 
 (declare-function h/view-file "hyperdrive")
@@ -297,18 +297,18 @@ Interactively, visit file or directory at point in
   "Open hyperdrive ENTRY at point in `view-mode'.
 Interactively, opens file or directory at point in
 `hyperdrive-dir' buffer."
-  (declare (modes h/dir-mode))
   (interactive (list (or (h/dir--entry-at-point)
-                         (h/user-error "No file/directory at point"))))
+                         (h/user-error "No file/directory at point")))
+               h/dir-mode)
   (h/view-file entry))
 
 (declare-function h/copy-url "hyperdrive")
 
 (defun h/dir-copy-url (entry)
   "Copy URL of ENTRY into the kill ring."
-  (declare (modes h/dir-mode))
   (interactive (list (or (h/dir--entry-at-point)
-                         (h/user-error "No file/directory at point"))))
+                         (h/user-error "No file/directory at point")))
+               h/dir-mode)
   (h/copy-url entry))
 
 (declare-function h/history "hyperdrive-history")
diff --git a/hyperdrive-ewoc.el b/hyperdrive-ewoc.el
index 8d0c3de027..8cec58d1d9 100644
--- a/hyperdrive-ewoc.el
+++ b/hyperdrive-ewoc.el
@@ -73,8 +73,7 @@ last node."
   "Move forward N entries.
 When on header line, moves point to first entry, skipping over
 column headers."
-  (declare (modes h/ewoc-mode))
-  (interactive "p")
+  (interactive "p" h/ewoc-mode)
   ;; TODO: Try using the intangible text property on headers to
   ;; automatically skip over them without conditional code. Setting
   ;; `cursor-intangible' on the column header causes `hl-line-mode' to
@@ -90,8 +89,7 @@ column headers."
   "Move backward N entries.
 When on first entry, moves point to header line, skipping over
 column headers."
-  (declare (modes h/ewoc-mode))
-  (interactive "p")
+  (interactive "p" h/ewoc-mode)
   (let ((lines-below-header (- (line-number-at-pos) 2)))
     (if (and (cl-plusp lines-below-header)
              (< n lines-below-header))
diff --git a/hyperdrive-history.el b/hyperdrive-history.el
index b91f58233d..dfcd900653 100644
--- a/hyperdrive-history.el
+++ b/hyperdrive-history.el
@@ -250,7 +250,6 @@ prefix argument \\[universal-argument], prompt for ENTRY."
 (defun h/history-diff (old-entry new-entry)
   "Show diff between OLD-ENTRY and NEW-ENTRY.
 Interactively, diff range entry at point with previous entry."
-  (declare (modes h/history-mode))
   ;; TODO: Set entries based on marked ranges
   ;; TODO: What to do for unknown range-entries?
   (interactive (let* ((new-entry (cdr (h/history-range-entry-at-point)))
@@ -258,7 +257,7 @@ Interactively, diff range entry at point with previous 
entry."
                  (unless old-entry
                    (setf old-entry (h/copy-tree new-entry t))
                    (cl-decf (he/version old-entry)))
-                 (list old-entry new-entry)))
+                 (list old-entry new-entry)) h/history-mode)
   (h/diff-file-entries old-entry new-entry
     :then (lambda ()
             (pop-to-buffer (current-buffer)))))
@@ -273,8 +272,7 @@ entry at RANGE-ENTRY's RANGE-END.
 
 Interactively, visit entry at point in `hyperdrive-history'
 buffer."
-  (declare (modes h/history-mode))
-  (interactive (list (h/history-range-entry-at-point)))
+  (interactive (list (h/history-range-entry-at-point)) h/history-mode)
   (pcase-exhaustive (h/range-entry-exists-p range-entry)
     ('t
      ;; Known to exist: open it.
@@ -294,8 +292,7 @@ entry at RANGE-ENTRY's RANGE-END.
 
 Interactively, visit entry at point in `hyperdrive-history'
 buffer."
-  (declare (modes h/history-mode))
-  (interactive (list (h/history-range-entry-at-point)))
+  (interactive (list (h/history-range-entry-at-point)) h/history-mode)
   (h/history-find-file
    range-entry :then (lambda ()
                        (pop-to-buffer (current-buffer) t))))
@@ -308,8 +305,7 @@ and returns nil.
 
 Interactively, visit entry at point in `hyperdrive-history'
 buffer."
-  (declare (modes h/history-mode))
-  (interactive (list (h/history-range-entry-at-point)))
+  (interactive (list (h/history-range-entry-at-point)) h/history-mode)
   (pcase-exhaustive (h/range-entry-exists-p range-entry)
     ('t
      ;; Known to exist: open it.
@@ -325,8 +321,7 @@ buffer."
 
 (defun h/history-copy-url (range-entry)
   "Copy URL of entry in RANGE-ENTRY into the kill ring."
-  (declare (modes h/history-mode))
-  (interactive (list (h/history-range-entry-at-point)))
+  (interactive (list (h/history-range-entry-at-point)) h/history-mode)
   (pcase-exhaustive (h/range-entry-exists-p range-entry)
     ('t
      ;; Known to exist: copy it.
@@ -342,7 +337,6 @@ buffer."
 
 (defun h/history-download-file (range-entry filename)
   "Download entry in RANGE-ENTRY at point to FILENAME on disk."
-  (declare (modes h/history-mode))
   (interactive
    (pcase-let* ((range-entry (h/history-range-entry-at-point))
                 ((cl-struct hyperdrive-entry name) (cdr range-entry))
@@ -356,7 +350,7 @@ buffer."
                                  ;; check for the existence of the entry.
                                  (read-file-name "Filename: "
                                                  (expand-file-name name 
h/download-directory)))))
-     (list range-entry read-filename)))
+     (list range-entry read-filename)) h/history-mode)
   (pcase-exhaustive (h/range-entry-exists-p range-entry)
     ('t
      ;; Known to exist: download it.
diff --git a/hyperdrive-mirror.el b/hyperdrive-mirror.el
index e5491dc86a..fa2c54cbf1 100644
--- a/hyperdrive-mirror.el
+++ b/hyperdrive-mirror.el
@@ -357,8 +357,7 @@ grouping keys, as in `hyperdrive-mirror-default-keys'."
 
 (defun h/mirror-do-upload ()
   "Upload files in current \"*hyperdrive-mirror*\" buffer."
-  (declare (modes h/mirror-mode))
-  (interactive)
+  (interactive nil h/mirror-mode)
   ;; FIXME: Debounce this (e.g. if the user accidentally calls this
   ;; command twice in a mirror buffer, it would start another queue to
   ;; upload the same files, which would unnecessarily increment the
diff --git a/hyperdrive.el b/hyperdrive.el
index 89683dbe7d..543c04ce3a 100644
--- a/hyperdrive.el
+++ b/hyperdrive.el
@@ -268,8 +268,7 @@ without confirmation."
 
 (defun h/revert-buffer-quick ()
   "Like `revert-buffer-quick', but works with `hyperdrive-mode' files."
-  (declare (modes h/mode))
-  (interactive)
+  (interactive nil h/mode)
   (h/revert-buffer nil (not (buffer-modified-p))))
 
 ;;;; h/mode
@@ -521,8 +520,7 @@ To be used in `write-contents-functions'."
   "Save hyperdrive ENTRY's URL to the kill ring.
 Interactively, uses `hyperdrive-current-entry', from either a
 hyperdrive directory listing or a `hyperdrive-mode' file buffer."
-  (declare (modes h/mode))
-  (interactive (list h/current-entry))
+  (interactive (list h/current-entry) h/mode)
   (let ((url (he/url entry)))
     (kill-new url)
     (h/message "%s" url)))
@@ -531,11 +529,11 @@ hyperdrive directory listing or a `hyperdrive-mode' file 
buffer."
   "Go up to parent directory of ENTRY.
 Interactively, use the `hyperdrive-current-entry'.  If THEN, pass
 it to `hyperdrive-open'."
-  (declare (modes h/mode))
   (interactive (progn
                  (unless (and h/mode h/current-entry)
                    (user-error "Not a hyperdrive buffer"))
-                 (list h/current-entry)))
+                 (list h/current-entry))
+               h/mode)
   (if-let ((parent (h/parent entry)))
       ;; TODO: Go to entry in parent directory.
       (if then-set-p
@@ -552,8 +550,7 @@ it to `hyperdrive-open'."
 
 (defun h/open-previous-version (entry)
   "Open previous version of ENTRY."
-  (declare (modes h/mode))
-  (interactive (list h/current-entry))
+  (interactive (list h/current-entry) h/mode)
   (if-let ((previous-entry (he/previous entry)))
       (h/open previous-entry)
     (h/message "%s does not exist at version %s. Try \\[hyperdrive-history]"
@@ -562,8 +559,7 @@ it to `hyperdrive-open'."
 
 (defun h/open-next-version (entry)
   "Open next version of ENTRY."
-  (declare (modes h/mode))
-  (interactive (list h/current-entry))
+  (interactive (list h/current-entry) h/mode)
   (pcase-exhaustive (he/next entry)
     ((and (pred (eq entry)) next-entry)
      ;; ENTRY already at latest version: open and say `revert-buffer'.
@@ -584,12 +580,12 @@ it to `hyperdrive-open'."
 (defun h/open-at-version (entry version)
   "Open ENTRY at VERSION.
 Nil VERSION means open the entry at its hyperdrive's latest version."
-  (declare (modes h/mode))
   (interactive (let ((entry h/current-entry))
                  (list entry (h/read-version
                               :hyperdrive (he/hyperdrive entry)
                               :prompt (format-message "Open `%s' at version 
(leave blank for latest version)"
-                                                      (h//format-entry 
entry))))))
+                                                      (h//format-entry 
entry)))))
+               h/mode)
   (if-let ((latest-entry (he/at version entry)))
       (h/open latest-entry)
     (h/message "%s does not exist at version %s. Try \\[hyperdrive-history]"