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

fix(lib): don't kill buffers visible in another frame

Browse source 
For Doom's kill-current-buffer advice.
This commit is contained in:
Henrik Lissner 2024-06-26 23:21:06 -04:00
parent 5718e4e96e
commit a24ff58a5a
No known key found for this signature in database
GPG key ID: B60957CA074D39A3
2 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lisp/doom-ui.el
View file

@ -225,7 +225,7 @@ windows, switch to `doom-fallback-buffer'. Otherwise, delegate to original
(when (or ;; if there aren't more real buffers than visible buffers, (when (or ;; if there aren't more real buffers than visible buffers,
;; then there are no real, non-visible buffers left. ;; then there are no real, non-visible buffers left.
(not (cl-set-difference (doom-real-buffer-list) (not (cl-set-difference (doom-real-buffer-list)
(doom-visible-buffers))) (doom-visible-buffers nil t)))
;; if we end up back where we start (or previous-buffer ;; if we end up back where we start (or previous-buffer
;; returns nil), we have nowhere left to go ;; returns nil), we have nowhere left to go
(memq (switch-to-prev-buffer nil t) (list buf 'nil))) (memq (switch-to-prev-buffer nil t) (list buf 'nil)))

8
lisp/lib/buffers.el
View file

@ -179,9 +179,13 @@ If DERIVED-P, test with `derived-mode-p', otherwise use `eq'."
collect window)) collect window))
;;;###autoload ;;;###autoload
(defun doom-visible-buffers (&optional buffer-list) (defun doom-visible-buffers (&optional buffer-list all-frames)
"Return a list of visible buffers (i.e. not buried)." "Return a list of visible buffers (i.e. not buried)."
(let ((buffers (delete-dups (mapcar #'window-buffer (window-list))))) (let ((buffers
(delete-dups
(cl-loop for frame in (if all-frames (visible-frame-list) (list (selected-frame)))
if (window-list frame)
nconc (mapcar #'window-buffer it)))))
(if buffer-list (if buffer-list
(cl-delete-if (lambda (b) (memq b buffer-list)) (cl-delete-if (lambda (b) (memq b buffer-list))
buffers) buffers)