[elpa] externals/ssh-deploy d9f61e1 071/133: Resolved byte-compilation with optional hydra feature

[Stefan Monnier]

branch: externals/ssh-deploy
commit d9f61e1de36219baca4345828eda4dff25d96207
Author: Christian Johansson <christian@cvj.se>
Commit: Christian Johansson <christian@cvj.se>

    Resolved byte-compilation with optional hydra feature
---
 README.md           |  5 ++-
 ssh-deploy-hydra.el | 90 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 ssh-deploy.el       | 51 ++++--------------------------
 3 files changed, 98 insertions(+), 48 deletions(-)

diff --git a/README.md b/README.md
index f996f90..f41ca47 100644
--- a/README.md
+++ b/README.md
@@ -178,7 +178,7 @@ By combining a `~/.authinfo.gpg` setup and a `public-key` 
setup you should be ab
 
 If you want to use the pre-defined hydra you can use this key-binding instead:
 ``` elisp
-(global-set-key (kbd "C-c C-z") 'ssh-deploy-hydra/body)
+(ssh-deploy-hydra "C-c C-z")
 ```
 
 * Or use the `use-package` and `hydra-script` I'm using:
@@ -187,13 +187,12 @@ If you want to use the pre-defined hydra you can use this 
key-binding instead:
       (use-package ssh-deploy
         :ensure t
         :demand
-        :after hydra
-        :bind (("C-c C-z" . ssh-deploy-hydra/body))
         :hook ((after-save . ssh-deploy-after-save)
                (find-file . ssh-deploy-find-file))
         :config
         (ssh-deploy-line-mode) ;; If you want mode-line feature
         (ssh-deploy-add-menu) ;; If you want menu-bar feature
+        (ssh-deploy-hydra "C-c C-z") ;; If you want the hydra feature
       )
 ```
 
diff --git a/ssh-deploy-hydra.el b/ssh-deploy-hydra.el
new file mode 100644
index 0000000..2f406e2
--- /dev/null
+++ b/ssh-deploy-hydra.el
@@ -0,0 +1,90 @@
+;;; ssh-deploy-hydra.el --- Deployment via Tramp, global or per directory.  
-*- lexical-binding:t -*-
+
+;; Copyright (C) 2017-2019  Free Software Foundation, Inc.
+
+;; Package-Requires: ((emacs "25"))
+
+;; This file is not part of GNU Emacs.
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 3, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; This file only contains hydra shortcut
+
+;; Please see README.md from the same repository for more extended 
documentation.
+
+;;; Code:
+
+
+(autoload 'ssh-deploy-upload-handler-forced "ssh-deploy")
+(autoload 'ssh-deploy-upload-handler "ssh-deploy")
+(autoload 'ssh-deploy-download-handler "ssh-deploy")
+(autoload 'ssh-deploy-delete-handler "ssh-deploy")
+(autoload 'ssh-deploy-diff-handler "ssh-deploy")
+(autoload 'ssh-deploy-remote-terminal-eshell-base-handler "ssh-deploy")
+(autoload 'ssh-deploy-remote-terminal-eshell-handler "ssh-deploy")
+(autoload 'ssh-deploy-remote-terminal-shell-base-handler "ssh-deploy")
+(autoload 'ssh-deploy-remote-terminal-shell-handler "ssh-deploy")
+(autoload 'ssh-deploy-remote-changes-handler "ssh-deploy")
+(autoload 'ssh-deploy-rename-handler "ssh-deploy")
+(autoload 'ssh-deploy-browse-remote-base-handler "ssh-deploy")
+(autoload 'ssh-deploy-browse-remote-handler "ssh-deploy")
+(autoload 'ssh-deploy-open-remote-file-handler "ssh-deploy")
+(autoload 'ssh-deploy-remote-sql-mysql-handler "ssh-deploy")
+(autoload 'ssh-deploy-run-deploy-script-handler "ssh-deploy")
+
+(require 'hydra)
+
+;;;###autoload
+(defun ssh-deploy-hydra (shortcut)
+  "Attach hydra at SHORTCUT."
+  (when (fboundp 'defhydra)
+    (defhydra ssh-deploy-hydra (:color red :hint nil)
+      "
+    SSH Deploy Menu
+    
+    _u_: Upload                              _f_: Force Upload
+    _d_: Download
+    _D_: Delete
+    _x_: Difference
+    _t_: Eshell Base Terminal                _T_: Eshell Relative Terminal
+    _h_: Shell Base Terminal                 _H_: Shell Relative Terminal
+    _e_: Detect Remote Changes
+    _R_: Rename
+    _b_: Browse Base                         _B_: Browse Relative
+    _o_: Open current file on remote         _m_: Open sql-mysql on remote
+    _s_: Run deploy script
+    "
+      ("f" #'ssh-deploy-upload-handler-forced)
+      ("u" #'ssh-deploy-upload-handler)
+      ("d" #'ssh-deploy-download-handler)
+      ("D" #'ssh-deploy-delete-handler)
+      ("x" #'ssh-deploy-diff-handler)
+      ("t" #'ssh-deploy-remote-terminal-eshell-base-handler)
+      ("T" #'ssh-deploy-remote-terminal-eshell-handler)
+      ("h" #'ssh-deploy-remote-terminal-shell-base-handler)
+      ("H" #'ssh-deploy-remote-terminal-shell-handler)
+      ("e" #'ssh-deploy-remote-changes-handler)
+      ("R" #'ssh-deploy-rename-handler)
+      ("b" #'ssh-deploy-browse-remote-base-handler)
+      ("B" #'ssh-deploy-browse-remote-handler)
+      ("o" #'ssh-deploy-open-remote-file-handler)
+      ("m" #'ssh-deploy-remote-sql-mysql-handler)
+      ("s" #'ssh-deploy-run-deploy-script-handler))
+    (when (fboundp 'ssh-deploy-hydra/body)
+      (global-set-key (kbd shortcut) #'ssh-deploy-hydra/body))))
+
+(provide 'ssh-deploy-hydra)
+;;; ssh-deploy-hydra.el ends here
diff --git a/ssh-deploy.el b/ssh-deploy.el
index d456b99..ce3197c 100644
--- a/ssh-deploy.el
+++ b/ssh-deploy.el
@@ -1,12 +1,12 @@
 ;;; ssh-deploy.el --- Deployment via Tramp, global or per directory.  -*- 
lexical-binding:t -*-
 
-;; Copyright (C) 2017-2018  Free Software Foundation, Inc.
+;; Copyright (C) 2017-2019  Free Software Foundation, Inc.
 
 ;; Author: Christian Johansson <christian@cvj.se>
 ;; Maintainer: Christian Johansson <christian@cvj.se>
 ;; Created: 5 Jul 2016
-;; Modified: 8 Apr 2019
-;; Version: 3.0.4
+;; Modified: 10 Apr 2019
+;; Version: 3.0.5
 ;; Keywords: tools, convenience
 ;; URL: https://github.com/cjohansson/emacs-ssh-deploy
 
@@ -68,19 +68,18 @@
 ;;     (global-set-key (kbd "C-c C-z") 'ssh-deploy-prefix-map)
 ;;
 ;; - To set global key-bindings for the pre-defined hydra do something like 
this:
-;;     (global-set-key (kbd "C-c C-z") 'ssh-deploy-hydra/body)
+;;     (ssh-deploy-hydra "C-c C-z")
 ;;
 ;; - To install and set-up using use-package and hydra do this:
 ;;   (use-package ssh-deploy
 ;;     :ensure t
 ;;     :demand
-;;     :after hydra
-;;     :bind (("C-c C-z" . ssh-deploy-hydra/body))
 ;;     :hook ((after-save . ssh-deploy-after-save)
 ;;            (find-file . ssh-deploy-find-file))
 ;;     :config
 ;;     (ssh-deploy-line-mode) ;; If you want mode-line feature
 ;;     (ssh-deploy-add-menu) ;; If you want menu-bar feature
+;;     (ssh-deploy-hydra "C-c C-z") ;; If you the hydra feature
 ;;    )
 ;;
 ;;
@@ -136,6 +135,7 @@
 
 
 (autoload 'ssh-deploy-diff-mode "ssh-deploy-diff-mode")
+(autoload 'ssh-deploy-hydra "ssh-deploy-hydra")
 
 (defgroup ssh-deploy nil
   "Upload, download, difference, browse and terminal handler for files and 
directories on remote hosts via Tramp."
@@ -1380,45 +1380,6 @@
 (defun ssh-deploy-add-find-file-hook () "Add the `find-file-hook'."
        (when (fboundp 'ssh-deploy-find-file) (add-hook 'find-file-hook 
'ssh-deploy-find-file)))
 
-;;;###autoload
-(defun ssh-deploy-set-hydra (shortcut)
-  "Attach hydra at SHORTCUT."
-  (when (fboundp 'defhydra)
-    (defhydra ssh-deploy-hydra (:color red :hint nil)
-      "
-    SSH Deploy Menu
-    
-    _u_: Upload                              _f_: Force Upload
-    _d_: Download
-    _D_: Delete
-    _x_: Difference
-    _t_: Eshell Base Terminal                _T_: Eshell Relative Terminal
-    _h_: Shell Base Terminal                 _H_: Shell Relative Terminal
-    _e_: Detect Remote Changes
-    _R_: Rename
-    _b_: Browse Base                         _B_: Browse Relative
-    _o_: Open current file on remote         _m_: Open sql-mysql on remote
-    _s_: Run deploy script
-    "
-      ("f" #'ssh-deploy-upload-handler-forced)
-      ("u" #'ssh-deploy-upload-handler)
-      ("d" #'ssh-deploy-download-handler)
-      ("D" #'ssh-deploy-delete-handler)
-      ("x" #'ssh-deploy-diff-handler)
-      ("t" #'ssh-deploy-remote-terminal-eshell-base-handler)
-      ("T" #'ssh-deploy-remote-terminal-eshell-handler)
-      ("h" #'ssh-deploy-remote-terminal-shell-base-handler)
-      ("H" #'ssh-deploy-remote-terminal-shell-handler)
-      ("e" #'ssh-deploy-remote-changes-handler)
-      ("R" #'ssh-deploy-rename-handler)
-      ("b" #'ssh-deploy-browse-remote-base-handler)
-      ("B" #'ssh-deploy-browse-remote-handler)
-      ("o" #'ssh-deploy-open-remote-file-handler)
-      ("m" #'ssh-deploy-remote-sql-mysql-handler)
-      ("s" #'ssh-deploy-run-deploy-script-handler))
-    (when (fboundp 'ssh-deploy-hydra/body)
-      (global-set-key (kbd shortcut) #'ssh-deploy-hydra/body))))
-
 (defvar ssh-deploy-prefix-map
   (let ((map (make-sparse-keymap)))
     (define-key map "f" 'ssh-deploy-upload-handler-force)