branch: externals/ssh-deploy
commit 952abf0366f3216a515bb707c61705f8398f2fe7
Author: Christian Johansson <christ...@cvj.se>
Commit: Christian Johansson <christ...@cvj.se>
Changed reference to zdiff-tree to ztree-diff and added more checks to see
if tramp-term is installed before calling it.
---
README.md | 2 +-
ssh-deploy.el | 6 ++++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/README.md b/README.md
index 6a79ea0..fe13e4e 100644
--- a/README.md
+++ b/README.md
@@ -39,7 +39,7 @@ This application is made by Christian Johansson
<christ...@cvj.se> 2016 and is l
You can remove the `add-to-list` line if you installed via `MELPA` repository.
* Now when you save a file somewhere under the directory
`/Users/username/Web/MySite/`, the script will launch and deploy the file with
the remote server.
-* If you press `C-c C-z x` and the current buffer is a file, you will launch a
`ediff` session showing differences between local file and remote file using
`tramp`, or if current buffer is a directory it will show differences with
remote directory using `zdiff-tree`.
+* If you press `C-c C-z x` and the current buffer is a file, you will launch a
`ediff` session showing differences between local file and remote file using
`tramp`, or if current buffer is a directory it will show differences with
remote directory using `ztree-diff` using `tramp`.
* If you press `C-c C-z u` you will upload local file or directory to remote
host.
* If you press `C-c C-z d` you will download the current file or directory
from remote host and then reload current buffer.
* If you press `C-c C-z t` you will open a terminal with remote host.
diff --git a/ssh-deploy.el b/ssh-deploy.el
index 5a2efae..64b06bc 100644
--- a/ssh-deploy.el
+++ b/ssh-deploy.el
@@ -55,7 +55,7 @@
;;; Code:
(defgroup ssh-deploy nil
- "Upload, download and difference handler for files and directories on remote
hosts via SSH."
+ "Upload, download, difference, browse and terminal handler for files and
directories on remote hosts via SSH."
:group 'tools
:group 'convenience)
@@ -88,7 +88,9 @@
(defun ssh-deploy-remote-terminal (remote-host)
"Opens REMOTE-HOST in tramp terminal."
- (if (fboundp 'tramp-term)
+ (if (and (fboundp 'tramp-term)
+ (fboundp 'tramp-term--initialize)
+ (fboundp 'tramp-term--do-ssh-login))
(progn
(let ((hostname (replace-regexp-in-string ":.*$" "" remote-host)))
(let ((host (split-string hostname "@")))
