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

Rewrite +term/toggle #1492

Browse source 
multi-term performs a lot of hackery on Emacs' windows API, which causes
problems, particularly for persp-mode. To side-step it all we must
reinvent some of the wheel.
This commit is contained in:
Henrik Lissner 2019-06-14 12:33:09 +02:00
parent 20f66b7560
commit 7ce4a25e1e
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 27 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,5 +1,8 @@
;;; term/term/autoload.el -*- lexical-binding: t; -*- ;;; term/term/autoload.el -*- lexical-binding: t; -*-
(defvar +term--dedicated-buffer nil)
(defvar +term--dedicated-window nil)
;;;###autoload ;;;###autoload
(defun +term/toggle (arg) (defun +term/toggle (arg)
"Toggle a persistent terminal popup window at project's root. "Toggle a persistent terminal popup window at project's root.
@ -12,28 +15,30 @@ If prefix ARG, recreate term buffer in the current project's root."
(let ((default-directory (or (doom-project-root) default-directory)) (let ((default-directory (or (doom-project-root) default-directory))
(multi-term-dedicated-buffer-name "doom:term-popup") (multi-term-dedicated-buffer-name "doom:term-popup")
(multi-term-dedicated-select-after-open-p t) (multi-term-dedicated-select-after-open-p t)
confirm-kill-processes confirm-kill-processes)
current-prefix-arg)
(cl-letf (((symbol-function #'multi-term-dedicated-get-window)
(lambda () (setq multi-term-dedicated-window
(display-buffer-in-side-window
multi-term-dedicated-buffer
`((window-height . ,multi-term-dedicated-window-height)))))))
(when arg (when arg
(when (multi-term-window-exist-p multi-term-dedicated-window) (when (multi-term-window-exist-p +term--dedicated-window)
(delete-window multi-term-dedicated-window)) (delete-window +term--dedicated-window))
(when (multi-term-buffer-exist-p multi-term-dedicated-buffer) (when (multi-term-buffer-exist-p +term--dedicated-buffer)
(when-let (process (get-buffer-process multi-term-dedicated-buffer)) (when-let (process (get-buffer-process +term--dedicated-buffer))
(kill-process process)) (kill-process process))
(kill-buffer multi-term-dedicated-buffer))) (kill-buffer +term--dedicated-buffer)))
(if (multi-term-dedicated-exist-p) (if (multi-term-dedicated-exist-p)
(if (eq (selected-window) multi-term-dedicated-window) (if (eq (selected-window) +term--dedicated-window)
(multi-term-dedicated-close) (multi-term-dedicated-close)
(select-window multi-term-dedicated-window) (select-window +term--dedicated-window)
(when (bound-and-true-p evil-local-mode) (when (bound-and-true-p evil-local-mode)
(evil-change-to-initial-state)) (evil-change-to-initial-state))
(goto-char (point-max))) (goto-char (point-max)))
(multi-term-dedicated-open))))) (let ((buffer (multi-term-get-buffer nil t)))
(with-current-buffer buffer
(multi-term-internal)
(setq +term--dedicated-buffer buffer))
(when-let (window
(display-buffer-in-side-window
buffer `((window-height . ,multi-term-dedicated-window-height))))
(setq +term--dedicated-window window)
(select-window window))))))
;;;###autoload ;;;###autoload
(defun +term/here (arg) (defun +term/here (arg)