From b98f34d1fdc99e8e385d89ae94f84b8c5b113dde Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Mon, 4 Mar 2019 14:07:34 -0500
Subject: [PATCH] Add :killb & doom/kill-buried-buffers

Also fix reported killed-buffer count when invoking kill commands
interactively.
---
 core/autoload/buffers.el          | 42 +++++++++++++++++++++++--------
 modules/feature/evil/+commands.el |  1 +
 2 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/core/autoload/buffers.el b/core/autoload/buffers.el
index 8daf0b908..f077ccb65 100644
--- a/core/autoload/buffers.el
+++ b/core/autoload/buffers.el
@@ -263,7 +263,12 @@ that belong to the current project."
   (unless project-p
     (delete-other-windows))
   (switch-to-buffer (doom-fallback-buffer))
-  (mapc #'kill-buffer (if project-p (doom-project-buffer-list) (doom-buffer-list))))
+  (let ((buffers (if project-p (doom-project-buffer-list) (doom-buffer-list))))
+    (mapc #'kill-buffer buffers)
+    (when (called-interactively-p 'interactive)
+      (message "Killed %s buffers"
+               (- (length buffers)
+                  (length (cl-remove-if-not #'buffer-live-p buffers)))))))
 
 ;;;###autoload
 (defun doom/kill-other-buffers (&optional project-p)
@@ -272,13 +277,14 @@ that belong to the current project."
 If PROJECT-P (universal argument), kill only buffers that belong to the current
 project."
   (interactive "P")
-  (let ((buffers (if project-p (doom-project-buffer-list) (doom-buffer-list)))
-        (current-buffer (current-buffer)))
-    (dolist (buf buffers)
-      (unless (eq buf current-buffer)
-        (doom-kill-buffer-and-windows buf)))
+  (let ((buffers
+         (delq (current-buffer)
+               (if project-p (doom-project-buffer-list) (doom-buffer-list)))))
+    (mapc #'doom-kill-buffer-and-windows buffers)
     (when (called-interactively-p 'interactive)
-      (message "Killed %s buffers" (length buffers)))))
+      (message "Killed %s buffers"
+               (- (length buffers)
+                  (length (cl-remove-if-not #'buffer-live-p buffers)))))))
 
 ;;;###autoload
 (defun doom/kill-matching-buffers (pattern &optional project-p)
@@ -289,7 +295,23 @@ project."
   (interactive
    (list (read-regexp "Buffer pattern: ")
          current-prefix-arg))
-  (let* ((buffers (if project-p (doom-project-buffer-list) (doom-buffer-list)))
-         (n (doom-kill-matching-buffers pattern buffers)))
+  (let* ((buffers (if project-p (doom-project-buffer-list) (doom-buffer-list))))
+    (doom-kill-matching-buffers pattern buffers)
     (when (called-interactively-p 'interactive)
-      (message "Killed %s buffers" n))))
+      (message "Killed %d buffer(s)"
+               (- (length buffers)
+                  (length (cl-remove-if-not #'buffer-live-p buffers)))))))
+
+;;;###autoload
+(defun doom/kill-buried-buffers (&optional project-p)
+  "Kill buffers that are buried.
+
+If PROJECT-P (universal argument), only kill buried buffers belonging to the
+current project."
+  (interactive "P")
+  (let ((buffers (doom-buried-buffers (if project-p (doom-project-buffer-list)))))
+    (mapc #'kill-buffer buffers)
+    (when (called-interactively-p 'interactive)
+      (message "Killed %d buffer(s)"
+               (- (length buffers)
+                  (length (cl-remove-if-not #'buffer-live-p buffers)))))))
diff --git a/modules/feature/evil/+commands.el b/modules/feature/evil/+commands.el
index bb6f6a17a..72ed9c464 100644
--- a/modules/feature/evil/+commands.el
+++ b/modules/feature/evil/+commands.el
@@ -114,6 +114,7 @@ buffers."
 (evil-ex-define-cmd "k[ill]all"   #'+evil:kill-all-buffers)
 (evil-ex-define-cmd "k[ill]m"     #'+evil:kill-matching-buffers)
 (evil-ex-define-cmd "k[ill]o"     #'doom/kill-other-buffers)
+(evil-ex-define-cmd "k[ill]b"     #'doom/kill-buried-buffers)
 (evil-ex-define-cmd "l[ast]"      #'doom/popup-restore)
 (evil-ex-define-cmd "m[sg]"       #'view-echo-area-messages)
 (evil-ex-define-cmd "pop[up]"     #'doom/popup-this-buffer)