From 1a116f51a9b6b6fc0162dff8dcc1358cffa15d75 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Thu, 25 Sep 2025 15:56:43 -0400 Subject: [PATCH] fix(upload): ensure ssh-deploy is loaded The ssh-deploy-root-remote check isn't enough (they may be set file/dir locally before the package is loaded). --- modules/tools/upload/config.el | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/tools/upload/config.el b/modules/tools/upload/config.el index aee19799f..d0432799b 100644 --- a/modules/tools/upload/config.el +++ b/modules/tools/upload/config.el @@ -27,6 +27,7 @@ (add-hook! 'after-save-hook (defun +upload-init-after-save-h () (when (and (bound-and-true-p ssh-deploy-root-remote) + (require 'ssh-deploy nil t) (integerp ssh-deploy-on-explicit-save) (> ssh-deploy-on-explicit-save 0)) (ssh-deploy-upload-handler ssh-deploy-force-on-explicit-save) @@ -38,8 +39,8 @@ ;; (if possible) (add-hook! 'find-file-hook (defun +upload-init-find-file-h () - (when (bound-and-true-p ssh-deploy-root-remote) - (require 'ssh-deploy) + (when (and (bound-and-true-p ssh-deploy-root-remote) + (require 'ssh-deploy nil t)) (unless ssh-deploy-root-local (setq ssh-deploy-root-local (doom-project-root))) (when ssh-deploy-automatically-detect-remote-changes