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

Remove core-popup coupling

Browse source 
New popup management system coming soon!
This commit is contained in:
Henrik Lissner 2018-01-03 03:44:32 -05:00
parent e0c8e6daef
commit 8e7b822062
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
3 changed files with 11 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

19
modules/feature/workspaces/autoload/workspaces.el
View file

@ -405,16 +405,15 @@ end of the workspace list."
"Close the selected window. If it's the last window in the workspace, close
the workspace and move to the next."
(interactive)
(if (doom-popup-p)
(doom/popup-close)
(let ((current-persp-name (+workspace-current-name)))
(cond ((or (+workspace--protected-p current-persp-name)
(> (length (doom-visible-windows)) 1))
(if (bound-and-true-p evil-mode)
(evil-window-delete)
(delete-window)))
((> (length (+workspace-list-names)) 1)
(+workspace/delete current-persp-name))))))
(let ((delete-window-fn (if (featurep 'evil) #'evil-window-delete #'delete-window)))
(if (window-at-side-p)
(funcall delete-window-fn)
(let ((current-persp-name (+workspace-current-name)))
(cond ((or (+workspace--protected-p current-persp-name)
(cdr (doom-visible-windows)))
(funcall delete-window-fn))
((cdr (+workspace-list-names))
(+workspace/delete current-persp-name)))))))
;;;###autoload
(defun +workspace/close-workspace-or-frame ()