emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] externals/ssh-deploy 336833f 076/133: Got (autoload) working insi


From: Stefan Monnier
Subject: [elpa] externals/ssh-deploy 336833f 076/133: Got (autoload) working inside asynchronous process
Date: Sat, 27 Mar 2021 14:48:47 -0400 (EDT)

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

    Got (autoload) working inside asynchronous process
---
 ssh-deploy.el | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/ssh-deploy.el b/ssh-deploy.el
index b4bce17..984dc35 100644
--- a/ssh-deploy.el
+++ b/ssh-deploy.el
@@ -316,9 +316,11 @@
                      (ssh-deploy-async-with-threads 0)
                      (ssh-deploy-on-explicit-save 0)
                      (ssh-deploy-automatically-detect-remote-changes 0))
-                 (if ftp-netrc
-                     ;; Pass ange-ftp setting to asynchronous process
-                     (defvar ange-ftp-netrc-filename ftp-netrc))
+                 (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")
                  (funcall start)))
              finish)))
       (display-warning 'ssh-deploy "async-start functions are not 
available!"))))
@@ -739,7 +741,7 @@
                     (if (> async 0)
                         (progn
 
-                          ;; Update buffer status
+                          ;; Update mode-line status
                           (ssh-deploy--mode-line-set-status-and-update 
ssh-deploy--status-detecting-remote-changes)
 
                           ;; Asynchronous logic here



reply via email to

[Prev in Thread] Current Thread [Next in Thread]