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

Return buffer on +vterm/{here,toggle} commands

Browse source
This commit is contained in:
Henrik Lissner 2021-05-24 13:53:51 -04:00
parent 3a1aaacbad
commit 8841011a95
1 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -4,7 +4,9 @@
(defun +vterm/toggle (arg) (defun +vterm/toggle (arg)
"Toggles a terminal popup window at project root. "Toggles a terminal popup window at project root.
If prefix ARG is non-nil, recreate vterm buffer in the current project's root." If prefix ARG is non-nil, recreate vterm buffer in the current project's root.
Returns the vterm buffer."
(interactive "P") (interactive "P")
(+vterm--configure-project-root-and-display (+vterm--configure-project-root-and-display
arg arg
@ -35,19 +37,22 @@ If prefix ARG is non-nil, recreate vterm buffer in the current project's root."
(unless (eq major-mode 'vterm-mode) (unless (eq major-mode 'vterm-mode)
(vterm-mode)) (vterm-mode))
(+vterm--change-directory-if-remote)) (+vterm--change-directory-if-remote))
(pop-to-buffer buffer))))))) (pop-to-buffer buffer)))
(get-buffer buffer-name)))))
;;;###autoload ;;;###autoload
(defun +vterm/here (arg) (defun +vterm/here (arg)
"Open a terminal buffer in the current window at project root. "Open a terminal buffer in the current window at project root.
If prefix ARG is non-nil, cd into `default-directory' instead of project root." If prefix ARG is non-nil, cd into `default-directory' instead of project root.
Returns the vterm buffer."
(interactive "P") (interactive "P")
(+vterm--configure-project-root-and-display (+vterm--configure-project-root-and-display
arg arg
(lambda() (lambda()
(require 'vterm) (require 'vterm)
;; This hack forces vterm to redraw, fixing strange artefacting in the tty. ;; HACK forces vterm to redraw, fixing strange artefacting in the tty.
(save-window-excursion (save-window-excursion
(pop-to-buffer "*scratch*")) (pop-to-buffer "*scratch*"))
(let (display-buffer-alist) (let (display-buffer-alist)
@ -56,7 +61,9 @@ If prefix ARG is non-nil, cd into `default-directory' instead of project root."
(defun +vterm--configure-project-root-and-display (arg display-fn) (defun +vterm--configure-project-root-and-display (arg display-fn)
"Sets the environment variable PROOT and displays a terminal using `display-fn`. "Sets the environment variable PROOT and displays a terminal using `display-fn`.
If prefix ARG is non-nil, cd into `default-directory' instead of project root." If prefix ARG is non-nil, cd into `default-directory' instead of project root.
Returns the vterm buffer."
(unless (fboundp 'module-load) (unless (fboundp 'module-load)
(user-error "Your build of Emacs lacks dynamic modules support and cannot load vterm")) (user-error "Your build of Emacs lacks dynamic modules support and cannot load vterm"))
(let* ((project-root (or (doom-project-root) default-directory)) (let* ((project-root (or (doom-project-root) default-directory))
@ -65,8 +72,8 @@ If prefix ARG is non-nil, cd into `default-directory' instead of project root."
default-directory default-directory
project-root))) project-root)))
(setenv "PROOT" project-root) (setenv "PROOT" project-root)
(funcall display-fn) (prog1 (funcall display-fn)
(+vterm--change-directory-if-remote))) (+vterm--change-directory-if-remote))))
(defun +vterm--change-directory-if-remote () (defun +vterm--change-directory-if-remote ()
"When `default-directory` is remote, use the corresponding "When `default-directory` is remote, use the corresponding