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

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

[elpa] externals/ssh-deploy 908de0b: Fixed bug with remote shell termina


From: Christian Johansson
Subject: [elpa] externals/ssh-deploy 908de0b: Fixed bug with remote shell terminals not opening, updated copyright years
Date: Sat, 26 Jun 2021 18:41:21 -0400 (EDT)

branch: externals/ssh-deploy
commit 908de0b05a94f72c29a02b1830aa40b571cd581b
Author: Christian Johansson <cjohansson@users.noreply.github.com>
Commit: Christian Johansson <cjohansson@users.noreply.github.com>

    Fixed bug with remote shell terminals not opening, updated copyright years
---
 ssh-deploy-diff-mode.el |  2 +-
 ssh-deploy-hydra.el     |  2 +-
 ssh-deploy-test.el      |  2 +-
 ssh-deploy.el           | 22 +++++++++++++---------
 4 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/ssh-deploy-diff-mode.el b/ssh-deploy-diff-mode.el
index debed5d..335ff1f 100644
--- a/ssh-deploy-diff-mode.el
+++ b/ssh-deploy-diff-mode.el
@@ -1,6 +1,6 @@
 ;;; ssh-deploy-diff-mode.el --- Mode for interactive directory differences  
-*- lexical-binding:t -*-
 
-;; Copyright (C) 2017-2018  Free Software Foundation, Inc.
+;; Copyright (C) 2017-2021  Free Software Foundation, Inc.
 
 ;; This file is not part of GNU Emacs.
 
diff --git a/ssh-deploy-hydra.el b/ssh-deploy-hydra.el
index b3b21e3..c7ef45c 100644
--- a/ssh-deploy-hydra.el
+++ b/ssh-deploy-hydra.el
@@ -1,6 +1,6 @@
 ;;; ssh-deploy-hydra.el --- Deployment via Tramp, global or per directory.  
-*- lexical-binding:t -*-
 
-;; Copyright (C) 2017-2019  Free Software Foundation, Inc.
+;; Copyright (C) 2017-2021  Free Software Foundation, Inc.
 
 ;; Package-Requires: ((emacs "25"))
 
diff --git a/ssh-deploy-test.el b/ssh-deploy-test.el
index 4536c2a..4604deb 100644
--- a/ssh-deploy-test.el
+++ b/ssh-deploy-test.el
@@ -1,6 +1,6 @@
 ;;; ssh-deploy-test.el --- Unit and integration tests for ssh-deploy.  -*- 
lexical-binding:t -*-
 
-;; Copyright (C) 2017-2019  Free Software Foundation, Inc.
+;; Copyright (C) 2017-2021  Free Software Foundation, Inc.
 
 ;; This file is not part of GNU Emacs.
 
diff --git a/ssh-deploy.el b/ssh-deploy.el
index a299239..25cb375 100644
--- a/ssh-deploy.el
+++ b/ssh-deploy.el
@@ -1,12 +1,12 @@
 ;;; ssh-deploy.el --- Deployment via Tramp, global or per directory.  -*- 
lexical-binding:t -*-
 
-;; Copyright (C) 2017-2019  Free Software Foundation, Inc.
+;; Copyright (C) 2017-2021  Free Software Foundation, Inc.
 
 ;; Author: Christian Johansson <christian@cvj.se>
 ;; Maintainer: Christian Johansson <christian@cvj.se>
 ;; Created: 5 Jul 2016
-;; Modified: 10 Oct 2020
-;; Version: 3.1.12
+;; Modified: 27 Jun 2021
+;; Version: 3.1.13
 ;; Keywords: tools, convenience
 ;; URL: https://github.com/cjohansson/emacs-ssh-deploy
 
@@ -129,7 +129,7 @@
 ;; * `ssh-deploy-script' - Our custom lambda function that will be called 
using (funcall) when running deploy script *(function)*
 ;; * `ssh-deploy-async-with-threads' - Whether to use threads (make threads) 
instead of processes (async-start) for asynchronous operations *(integer)*
 ;;
-;; When integers are used as booleans, above zero means true, zero means false 
and nil means unset and fallback to global settings.
+;; When integers are used as booleans, above zero means true, zero means false 
and nil means unset and indicates to fallback to global settings.
 ;;
 ;; Please see README.md from the same repository for more extended 
documentation.
 
@@ -983,11 +983,15 @@
     (when (and (ssh-deploy--file-is-in-path-p path-local root-local)
                (ssh-deploy--file-is-included-p path-local exclude-list))
       (let ((path-remote (expand-file-name (ssh-deploy--get-relative-path 
root-local path-local) root-remote)))
-        (message "Opening eshell on '%s'.." path-remote)
+        (message "Opening shell on '%s'.." path-remote)
         (let ((default-directory path-remote)
               (explicit-shell-file-name ssh-deploy-remote-shell-executable))
-          (when explicit-shell-file-name ;; NOTE This is only to trick 
flycheck to ignore unused error
-            (shell path-remote)))))))
+          (when explicit-shell-file-name
+            ;; NOTE This is only to trick flycheck to ignore unused error
+            )
+          (let ((buffer (generate-new-buffer (format "*Shell %s*" 
path-remote))))
+            (switch-to-buffer buffer)
+            (shell buffer)))))))
 
 ;;;###autoload
 (defun ssh-deploy-store-revision (path &optional root)
@@ -1222,7 +1226,7 @@
 
 ;;;###autoload
 (defun ssh-deploy-remote-terminal-shell-handler ()
-  "Open current relative path on remote host in `eshell' but only if it's 
configured for deployment."
+  "Open current relative path on remote host in `shell' but only if it's 
configured for deployment."
   (interactive)
   (when (and (ssh-deploy--is-not-empty-string-p ssh-deploy-root-local)
              (ssh-deploy--is-not-empty-string-p ssh-deploy-root-remote)
@@ -1233,7 +1237,7 @@
 
 ;;;###autoload
 (defun ssh-deploy-remote-terminal-shell-base-handler ()
-  "Open base path on remote host in `eshell' but only if it's configured for 
deployment."
+  "Open base path on remote host in `shell' but only if it's configured for 
deployment."
   (interactive)
   (when (and (ssh-deploy--is-not-empty-string-p ssh-deploy-root-local)
              (ssh-deploy--is-not-empty-string-p ssh-deploy-root-remote))



reply via email to

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