[elpa] externals/ssh-deploy 0111640 108/133: Removed unnecessary async autoloads

[Stefan Monnier]

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

    Removed unnecessary async autoloads
---
 ssh-deploy.el | 41 +++++++++++++----------------------------
 1 file changed, 13 insertions(+), 28 deletions(-)

diff --git a/ssh-deploy.el b/ssh-deploy.el
index b9181b8..eb86b9f 100644
--- a/ssh-deploy.el
+++ b/ssh-deploy.el
@@ -327,28 +327,12 @@
                        (ssh-deploy-root-remote root-remote)
                        (ssh-deploy-revision-folder revision-folder)
                        (ssh-deploy-exclude-list exclude-list))
+
+                   ;; Pass ange-ftp setting to asynchronous process
                    (when ftp-netrc
-                     ;; Pass ange-ftp setting to asynchronous process
-                     (defvar ange-ftp-netrc-filename ftp-netrc))
-
-                   (autoload 'ediff-same-file-contents "ediff-util")
-                   (autoload 'string-remove-prefix "subr-x")
-
-                   (autoload 'ssh-deploy-download "ssh-deploy")
-                   (autoload 'ssh-deploy-download-handler "ssh-deploy")
-                   (autoload 'ssh-deploy-upload "ssh-deploy")
-                   (autoload 'ssh-deploy-upload-handler "ssh-deploy")
-                   (autoload 'ssh-deploy-rename "ssh-deploy")
-                   (autoload 'ssh-deploy-rename-handler "ssh-deploy")
-                   (autoload 'ssh-deploy-delete "ssh-deploy")
-                   (autoload 'ssh-deploy-delete-both "ssh-deploy")
-                   (autoload 'ssh-deploy-delete-handler "ssh-deploy")
-                   (autoload 'ssh-deploy-diff "ssh-deploy")
-                   (autoload 'ssh-deploy-diff-handler "ssh-deploy")
-                   (autoload 'ssh-deploy--diff-directories-data "ssh-deploy")
-                   (autoload 'ssh-deploy--diff-directories-present 
"ssh-deploy")
-                   (autoload 'ssh-deploy--remote-changes-data "ssh-deploy")
-                   (autoload 'ssh-deploy--remote-changes-post-executor 
"ssh-deploy")
+                     (defvar ange-ftp-netrc-filename)
+                     (setq ange-ftp-netrc-filename ftp-netrc))
+
                    (funcall start)))
                finish))))
       (display-warning 'ssh-deploy "async-start functions are not 
available!"))))
@@ -577,12 +561,12 @@
                                 (not (null (string-match element 
relative-path))))
                        (setq included nil)))
 
+                   ;; Add relative path file a list
                    (when included
-                     (progn
-                       (puthash relative-path file-a files-a-relative-hash)
-                       (if (equal files-a-relative-list nil)
-                           (setq files-a-relative-list (list relative-path))
-                         (push relative-path files-a-relative-list)))))))
+                     (puthash relative-path file-a files-a-relative-hash)
+                     (if (equal files-a-relative-list nil)
+                         (setq files-a-relative-list (list relative-path))
+                       (push relative-path files-a-relative-list))))))
              files-a)
 
             ;; Collected included files in directory b with relative paths
@@ -599,6 +583,7 @@
                                 (not (null (string-match element 
relative-path))))
                        (setq included nil)))
 
+                   ;; Add relative path file a list
                    (when included
                      (puthash relative-path file-b files-b-relative-hash)
                      (if (equal files-b-relative-list nil)
@@ -1165,13 +1150,13 @@
              (file-exists-p buffer-file-name))
         (let* ((path-local (file-truename buffer-file-name))
                (root-local (file-truename ssh-deploy-root-local))
-               (path-remote (file-truename (expand-file-name 
(ssh-deploy--get-relative-path root-local path-local) ssh-deploy-root-remote))))
+               (path-remote (expand-file-name (ssh-deploy--get-relative-path 
root-local path-local) ssh-deploy-root-remote)))
           (ssh-deploy-diff path-local path-remote root-local ssh-deploy-debug 
ssh-deploy-exclude-list ssh-deploy-async ssh-deploy-async-with-threads 
ssh-deploy-on-explicit-save ssh-deploy-revision-folder 
ssh-deploy-automatically-detect-remote-changes))
       (when (and (ssh-deploy--is-not-empty-string-p default-directory)
                  (file-exists-p default-directory))
         (let* ((path-local (file-truename default-directory))
                (root-local (file-truename ssh-deploy-root-local))
-               (path-remote (file-truename (expand-file-name 
(ssh-deploy--get-relative-path root-local path-local) ssh-deploy-root-remote))))
+               (path-remote (expand-file-name (ssh-deploy--get-relative-path 
root-local path-local) ssh-deploy-root-remote)))
           (ssh-deploy-diff path-local path-remote root-local ssh-deploy-debug 
ssh-deploy-exclude-list ssh-deploy-async ssh-deploy-async-with-threads 
ssh-deploy-on-explicit-save ssh-deploy-revision-folder 
ssh-deploy-automatically-detect-remote-changes))))))
 
 ;;;###autoload