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

Fix save-buffer prompt occurring after buffer is buried

Browse source
This commit is contained in:
Henrik Lissner 2018-02-11 03:58:57 -05:00
parent 24bf471f55
commit 4566dea4b3
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

21
core/core-ui.el
View file

@ -554,15 +554,18 @@ windows, switch to `doom-fallback-buffer'. Otherwise, delegate to original
((eq buf (doom-fallback-buffer)) ((eq buf (doom-fallback-buffer))
(message "Can't kill the fallback buffer.")) (message "Can't kill the fallback buffer."))
((doom-real-buffer-p buf) ((doom-real-buffer-p buf)
(when (or ;; if there aren't more real buffers than visible buffers, (if (and (buffer-modified-p buf)
;; then there are no real, non-visible buffers left. (not (y-or-n-p "Buffer %s is modified; kill anyway?")))
(not (cl-set-difference (doom-real-buffer-list) (message "Aborted")
(doom-visible-buffers))) (when (or ;; if there aren't more real buffers than visible buffers,
;; if we end up back where we start (or previous-buffer ;; then there are no real, non-visible buffers left.
;; returns nil), we have nowhere left to go (not (cl-set-difference (doom-real-buffer-list)
(memq (previous-buffer) (list buf 'nil))) (doom-visible-buffers)))
(switch-to-buffer (doom-fallback-buffer))) ;; if we end up back where we start (or previous-buffer
(kill-buffer buf)) ;; returns nil), we have nowhere left to go
(memq (previous-buffer) (list buf 'nil)))
(switch-to-buffer (doom-fallback-buffer)))
(kill-buffer buf)))
(t (t
(funcall orig-fn))))) (funcall orig-fn)))))