From 7214affc73608d0dca32a2714e86e0ed34cb60d3 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Wed, 5 Dec 2018 22:07:33 -0500 Subject: [PATCH] tools/upload: set ssh-deploy vars sooner So that they don't overwrite file/dir local vars in some cases. --- modules/tools/upload/config.el | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/modules/tools/upload/config.el b/modules/tools/upload/config.el index 7e2c19246..177ca4bf5 100644 --- a/modules/tools/upload/config.el +++ b/modules/tools/upload/config.el @@ -19,6 +19,10 @@ ssh-deploy-browse-remote-handler ssh-deploy-remote-changes-handler) :init + (setq ssh-deploy-revision-folder (concat doom-cache-dir "ssh-revisions/") + ssh-deploy-on-explicit-save t + ssh-deploy-automatically-detect-remote-changes nil) + ;; Make these safe as file-local variables (dolist (sym '((ssh-deploy-root-local . stringp) (ssh-deploy-root-remote . stringp) @@ -44,9 +48,4 @@ (setq ssh-deploy-root-local (doom-project-root))) (when ssh-deploy-automatically-detect-remote-changes (ssh-deploy-remote-changes-handler)))) - (add-hook 'find-file-hook #'+upload|init-find-file) - :config - (setq ssh-deploy-revision-folder (concat doom-cache-dir "ssh-revisions/") - ssh-deploy-on-explicit-save t - ssh-deploy-automatically-detect-remote-changes t)) - + (add-hook 'find-file-hook #'+upload|init-find-file))