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

Fix eshell popup splits not closing on exit

Browse source 
Fixes "Attempt to delete main window of frame" errors, and ensrues an
eshell buffer is selected, if you were in a popup.
This commit is contained in:
Henrik Lissner 2018-06-28 18:03:45 +02:00
parent 05bdb1e12c
commit ca9da4c272
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 17 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

23
modules/emacs/eshell/autoload/eshell.el
View file

@ -21,11 +21,12 @@
(ring-remove +eshell-buffers idx) (ring-remove +eshell-buffers idx)
t)) t))
(defun +eshell--bury-buffer () (defun +eshell--bury-buffer (&optional dedicated-p)
(unless (switch-to-prev-buffer nil 'bury) (unless (switch-to-prev-buffer nil 'bury)
(switch-to-buffer (doom-fallback-buffer))) (switch-to-buffer (doom-fallback-buffer)))
(when +eshell-enable-new-shell-on-split (when +eshell-enable-new-shell-on-split
(+eshell/open t))) (when-let* ((win (get-buffer-window (+eshell/open t))))
(set-window-dedicated-p win dedicated-p))))
(defun +eshell--setup-window (window &optional flag) (defun +eshell--setup-window (window &optional flag)
(when (window-live-p window) (when (window-live-p window)
@ -168,21 +169,23 @@ delete."
"Create a new eshell window below the current one." "Create a new eshell window below the current one."
(interactive) (interactive)
(let ((ignore-window-parameters t) (let ((ignore-window-parameters t)
(dedicated-p (window-dedicated-p))
(+eshell-enable-new-shell-on-split (+eshell-enable-new-shell-on-split
(or +eshell-enable-new-shell-on-split (frame-parameter nil 'saved-wconf)))) (or +eshell-enable-new-shell-on-split (frame-parameter nil 'saved-wconf))))
(select-window (split-window-vertically)) (select-window (split-window-vertically))
(+eshell--bury-buffer))) (+eshell--bury-buffer dedicated-p)))
;;;###autoload ;;;###autoload
(defun +eshell/split-right () (defun +eshell/split-right ()
"Create a new eshell window to the right of the current one." "Create a new eshell window to the right of the current one."
(interactive) (interactive)
(let* ((ignore-window-parameters t) (let* ((ignore-window-parameters t)
(dedicated-p (window-dedicated-p))
(window-state (window-state-get)) (window-state (window-state-get))
(+eshell-enable-new-shell-on-split (+eshell-enable-new-shell-on-split
(or +eshell-enable-new-shell-on-split (frame-parameter nil 'saved-wconf)))) (or +eshell-enable-new-shell-on-split (frame-parameter nil 'saved-wconf))))
(select-window (split-window-horizontally)) (select-window (split-window-horizontally))
(+eshell--bury-buffer))) (+eshell--bury-buffer dedicated-p)))
;;;###autoload ;;;###autoload
(defun +eshell/switch-to-next () (defun +eshell/switch-to-next ()
@ -269,7 +272,15 @@ delete."
(let ((prev (save-window-excursion (previous-buffer)))) (let ((prev (save-window-excursion (previous-buffer))))
(unless (and prev (doom-real-buffer-p prev)) (unless (and prev (doom-real-buffer-p prev))
(switch-to-buffer (doom-fallback-buffer))))) (switch-to-buffer (doom-fallback-buffer)))))
((or (and (fboundp '+popup-window-p) (+popup-window-p)) ((or (window-dedicated-p win)
+eshell-kill-window-on-exit) +eshell-kill-window-on-exit)
(delete-window win))))))) (let ((ignore-window-parameters t)
(popup-p (window-dedicated-p win)))
(delete-window win)
(when popup-p
(cl-loop for win in (window-list)
for buf = (window-buffer win)
for mode = (buffer-local-value 'major-mode buf)
if (eq mode 'eshell-mode)
return (select-window win))))))))))