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

refactor!(:term): toggle commands now always hide

Browse source 
BREAKING CHANGE: previously, <leader> o t commands would only hide the
terminal popup if it was focused. If not, they would move the focus to
the terminal window. This is unintuitive to the "toggle" description,
and arguably less useful, since refocusing to the terminal can be easily
done with regular window refocus commands. Therefore, <leader> o t now
just hides the terminal popup.

Fix #3374
This commit is contained in:
Itai Y. Efrat 2021-09-21 14:57:00 +03:00 • committed by Henrik Lissner
parent 7274f73500
commit 7933e54542
4 changed files with 9 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

11
modules/term/eshell/autoload/eshell.el
View file

@ -99,14 +99,9 @@
(fundamental-mode) (fundamental-mode)
(erase-buffer)))) (erase-buffer))))
(if-let (win (get-buffer-window eshell-buffer)) (if-let (win (get-buffer-window eshell-buffer))
(if (eq (selected-window) win) (let (confirm-kill-processes)
(let (confirm-kill-processes) (delete-window win)
(delete-window win) (ignore-errors (kill-buffer eshell-buffer)))
(ignore-errors (kill-buffer eshell-buffer)))
(select-window win)
(when (bound-and-true-p evil-local-mode)
(evil-change-to-initial-state))
(goto-char (point-max)))
(with-current-buffer (pop-to-buffer eshell-buffer) (with-current-buffer (pop-to-buffer eshell-buffer)
(doom-mark-buffer-as-real-h) (doom-mark-buffer-as-real-h)
(if (eq major-mode 'eshell-mode) (if (eq major-mode 'eshell-mode)

13
modules/term/shell/autoload.el
View file

@ -69,15 +69,10 @@ If popup is focused, kill it."
"main")))) "main"))))
(dir default-directory)) (dir default-directory))
(if-let (win (get-buffer-window buffer)) (if-let (win (get-buffer-window buffer))
(if (eq (selected-window) win) (let (confirm-kill-processes)
(let (confirm-kill-processes) (set-process-query-on-exit-flag (get-buffer-process buffer) nil)
(set-process-query-on-exit-flag (get-buffer-process buffer) nil) (delete-window win)
(delete-window win) (ignore-errors (kill-buffer buffer)))
(ignore-errors (kill-buffer buffer)))
(select-window win)
(when (bound-and-true-p evil-local-mode)
(evil-change-to-initial-state))
(goto-char (point-max)))
(with-current-buffer (pop-to-buffer buffer) (with-current-buffer (pop-to-buffer buffer)
(if (not (eq major-mode 'shell-mode)) (if (not (eq major-mode 'shell-mode))
(shell buffer) (shell buffer)

7
modules/term/term/autoload.el
View file

@ -28,12 +28,7 @@ If prefix ARG, recreate the term buffer."
(setq buffer (multi-term-get-buffer nil t))) ; recreates buffer (setq buffer (multi-term-get-buffer nil t))) ; recreates buffer
(if (and (window-live-p window) (if (and (window-live-p window)
(buffer-live-p buffer)) (buffer-live-p buffer))
(if (eq (selected-window) window) (delete-window window)
(delete-window window)
(select-window window)
(when (bound-and-true-p evil-local-mode)
(evil-change-to-initial-state))
(goto-char (point-max)))
(setenv "PROOT" (or (doom-project-root) default-directory)) (setenv "PROOT" (or (doom-project-root) default-directory))
(with-current-buffer buffer (with-current-buffer buffer
(doom-mark-buffer-as-real-h) (doom-mark-buffer-as-real-h)

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

@ -26,12 +26,7 @@ Returns the vterm buffer."
(when (window-live-p window) (when (window-live-p window)
(delete-window window)))) (delete-window window))))
(if-let (win (get-buffer-window buffer-name)) (if-let (win (get-buffer-window buffer-name))
(if (eq (selected-window) win) (delete-window win)
(delete-window win)
(select-window win)
(when (bound-and-true-p evil-local-mode)
(evil-change-to-initial-state))
(goto-char (point-max)))
(let ((buffer (get-buffer-create buffer-name))) (let ((buffer (get-buffer-create buffer-name)))
(with-current-buffer buffer (with-current-buffer buffer
(unless (eq major-mode 'vterm-mode) (unless (eq major-mode 'vterm-mode)