Mirrors/exwm2
2
0
Fork 0
mirror of https://github.com/emacs-exwm/exwm.git synced 2024-11-23 13:07:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

Transfer surrogate minibuffers to the next workspace on delete (#74)

Browse source 
Othewise, we won't be able to delete the frame (frames with surrogate
minibuffers cannot be deleted).

* exwm-workspace.el
(exwm-workspace-delete): Transfer surrogate minibuffers to the next
workspace before attempting to delete a workspace (part of #64).
(exwm-workspace--prompt-delete): Use `exwm-workspace-delete' instead of
directly calling `delete-frame'.
This commit is contained in:
Steven Allen 2024-08-18 14:35:04 +00:00 committed by GitHub
parent 2f4e6fea7e
commit 8c61f7ef2c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
exwm-workspace.el
View file

@ -258,9 +258,9 @@ Show PROMPT to the user if non-nil."
(if (eq frame exwm-workspace--current) (if (eq frame exwm-workspace--current)
;; Abort the recursive minibuffer if deleting the current workspace. ;; Abort the recursive minibuffer if deleting the current workspace.
(progn (progn
(exwm--defer 0 #'delete-frame frame) (exwm--defer 0 #'exwm-workspace-delete frame)
(abort-recursive-edit)) (abort-recursive-edit))
(delete-frame frame) (exwm-workspace-delete frame)
(exwm-workspace--update-switch-history) (exwm-workspace--update-switch-history)
(goto-history-element (min minibuffer-history-position (goto-history-element (min minibuffer-history-position
(exwm-workspace--count))))))) (exwm-workspace--count)))))))
@ -824,6 +824,11 @@ INDEX must not exceed the current number of workspaces."
(exwm-workspace--workspace-from-frame-or-index (exwm-workspace--workspace-from-frame-or-index
frame-or-index) frame-or-index)
exwm-workspace--current))) exwm-workspace--current)))
;; Transfer over any surrogate minibuffers before trying to delete the workspace.
(let ((minibuf (minibuffer-window frame))
(newminibuf (minibuffer-window (exwm-workspace--get-next-workspace frame))))
(dolist (f (filtered-frame-list (lambda (f) (eq (frame-parameter f 'minibuffer) minibuf))))
(set-frame-parameter f 'minibuffer newminibuf)))
(delete-frame frame)))) (delete-frame frame))))
(defun exwm-workspace--set-desktop (id) (defun exwm-workspace--set-desktop (id)