From 81ab356d6e4a7d5de3281c659613c2a11f714b66 Mon Sep 17 00:00:00 2001 From: Shay Bergmann Date: Sat, 29 Jan 2022 20:41:02 -0500 Subject: [PATCH] refactor(vterm): remove +vterm--change-directory-if-remote This is no longer necessary as vterm handles this natively. moreover, it creates a redundant nested ssh session whenever `SPC o t` is used to re-open an existing vterm popup. --- modules/term/vterm/autoload.el | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-) diff --git a/modules/term/vterm/autoload.el b/modules/term/vterm/autoload.el index 7467c04de..87b52dc0f 100644 --- a/modules/term/vterm/autoload.el +++ b/modules/term/vterm/autoload.el @@ -30,8 +30,7 @@ Returns the vterm buffer." (let ((buffer (get-buffer-create buffer-name))) (with-current-buffer buffer (unless (eq major-mode 'vterm-mode) - (vterm-mode)) - (+vterm--change-directory-if-remote)) + (vterm-mode))) (pop-to-buffer buffer))) (get-buffer buffer-name))))) @@ -67,22 +66,4 @@ Returns the vterm buffer." default-directory project-root))) (setenv "PROOT" project-root) - (prog1 (funcall display-fn) - (+vterm--change-directory-if-remote)))) - -(defun +vterm--change-directory-if-remote () - "When `default-directory` is remote, use the corresponding -method to prepare vterm at the corresponding remote directory." - (when (and (featurep 'tramp) - (tramp-tramp-file-p default-directory)) - (message "default-directory is %s" default-directory) - (with-parsed-tramp-file-name default-directory path - (let ((method (cadr (assoc `tramp-login-program - (assoc path-method tramp-methods))))) - (vterm-send-string - (concat method " " - (when path-user (concat path-user "@")) path-host)) - (vterm-send-return) - (vterm-send-string - (concat "cd " path-localname)) - (vterm-send-return))))) + (funcall display-fn)))