emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Move the function back and rename

Browse source
This commit is contained in:
Sheng Yang 2020-05-09 01:06:19 -05:00
parent 39ce0c844b
commit 6c4e2d08d4
2 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

21
modules/term/vterm/autoload.el
View file

@ -34,7 +34,7 @@ If prefix ARG is non-nil, recreate vterm buffer in the current project's root."
(with-current-buffer buffer (with-current-buffer buffer
(unless (eq major-mode 'vterm-mode) (unless (eq major-mode 'vterm-mode)
(vterm-mode)) (vterm-mode))
(+vterm-open-remote-maybe)) (+vterm--change-directory-if-remote))
(pop-to-buffer buffer))))) (pop-to-buffer buffer)))))
;;;###autoload ;;;###autoload
@ -57,7 +57,24 @@ If prefix ARG is non-nil, cd into `default-directory' instead of project root."
display-buffer-alist) display-buffer-alist)
(setenv "PROOT" project-root) (setenv "PROOT" project-root)
(vterm) (vterm)
(+vterm-open-remote-maybe))) (+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)))))
(defvar +vterm--insert-point nil) (defvar +vterm--insert-point nil)

17
modules/term/vterm/config.el
View file

@ -19,23 +19,6 @@
;; Prevent premature horizontal scrolling ;; Prevent premature horizontal scrolling
hscroll-margin 0) hscroll-margin 0)
(defun +vterm-open-remote-maybe ()
"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)))))
;; Restore the point's location when leaving and re-entering insert mode. ;; Restore the point's location when leaving and re-entering insert mode.
(when (featurep! :editor evil) (when (featurep! :editor evil)
(add-hook! 'vterm-mode-hook (add-hook! 'vterm-mode-hook