branch: externals/ssh-deploy
commit 9efc523b41eee9bfb3daaa4dd706457841ff40e0
Author: Christian Johansson <christ...@cvj.se>
Commit: Christian Johansson <christ...@cvj.se>
Fixed typo in prefix-map
---
README.md | 11 +++++++++++
ssh-deploy.el | 6 +++---
2 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/README.md b/README.md
index 89233e3..b9fb515 100644
--- a/README.md
+++ b/README.md
@@ -260,6 +260,17 @@ Ange-FTP defaults to `~/.netrc` so you need to add this to
your init script:
(setq ange-ftp-netrc-filename "~/.authinfo.gpg")
```
+## DirectoryVariables not read in evil-mode / doom-emacs / spacemacs et. al
+
+Thanks `shrubbroom` for poiting out that `evil-mode` has a upstream bug were
the function `hack-local-variables` are not executed as expected and this
results in that DirectoryVariables are not set, to fix this you can add this to
your init-script:
+
+``` elisp
+(advice-add #'turn-on-evil-mode :before
+ (lambda (&optional args)
+ (when (eq major-mode 'fundamental-mode)
+ (hack-local-variables))))
+```
+
## Tests
Run `make test` from plug-in folder to run tests
diff --git a/ssh-deploy.el b/ssh-deploy.el
index 5e29122..a299239 100644
--- a/ssh-deploy.el
+++ b/ssh-deploy.el
@@ -5,8 +5,8 @@
;; Author: Christian Johansson <christ...@cvj.se>
;; Maintainer: Christian Johansson <christ...@cvj.se>
;; Created: 5 Jul 2016
-;; Modified: 6 Mar 2020
-;; Version: 3.1.11
+;; Modified: 10 Oct 2020
+;; Version: 3.1.12
;; Keywords: tools, convenience
;; URL: https://github.com/cjohansson/emacs-ssh-deploy
@@ -1364,7 +1364,7 @@
(defvar ssh-deploy-prefix-map
(let ((map (make-sparse-keymap)))
(define-key map "f" 'ssh-deploy-upload-handler-force)
- (define-key map "u" 'ssh-deploy-upload-handle)
+ (define-key map "u" 'ssh-deploy-upload-handler)
(define-key map "D" 'ssh-deploy-delete-handler)
(define-key map "d" 'ssh-deploy-download-handler)
(define-key map "x" 'ssh-deploy-diff-handler)
