From 568a7478b1b8cd8292823350b388b419b7819eaf Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Wed, 1 Mar 2017 19:23:06 -0500
Subject: [PATCH] private/hlissner: fix :killall :killm and :killo ex commands

---
 modules/private/hlissner/+commands.el     |  6 +++---
 modules/private/hlissner/autoload/evil.el | 14 ++++++++++++++
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/modules/private/hlissner/+commands.el b/modules/private/hlissner/+commands.el
index 4f070b7e6..cf1512692 100644
--- a/modules/private/hlissner/+commands.el
+++ b/modules/private/hlissner/+commands.el
@@ -43,9 +43,9 @@
 ;; Dealing with buffers
 (ex! "clean[up]"   'doom/cleanup-buffers)       ; Clean up old/unreal buffers
 (ex! "k[ill]"      'doom/kill-real-buffer)      ; Kill current buffer
-(ex! "k[ill]all"   'doom:kill-all-buffers)      ; Kill buffers (bang = in project)
-(ex! "k[ill]m"     'doom:kill-matching-buffers) ; kill buffers by regexp
-(ex! "k[ill]o"     'doom:kill-other-buffers)    ; kill other buffers
+(ex! "k[ill]all"   '+hlissner:kill-all-buffers)      ; Kill buffers (bang = in project)
+(ex! "k[ill]m"     '+hlissner:kill-matching-buffers) ; kill buffers by regexp
+(ex! "k[ill]o"     'doom/kill-other-buffers)    ; kill other buffers
 (ex! "l[ast]"      'doom/popup-last-buffer)     ; pop up last popup
 (ex! "m[sg]"       'view-echo-area-messages)    ; open *messages* in popup
 (ex! "pop[up]"     'doom/popup)                 ; open current buffer in popup
diff --git a/modules/private/hlissner/autoload/evil.el b/modules/private/hlissner/autoload/evil.el
index ac624c819..fe4b1ffed 100644
--- a/modules/private/hlissner/autoload/evil.el
+++ b/modules/private/hlissner/autoload/evil.el
@@ -20,3 +20,17 @@
   (interactive "<f>")
   (cd input))
 
+;;;###autoload (autoload '+hlissner:kill-all-buffers "private/hlissner/autoload/evil" nil t)
+(evil-define-command +hlissner:kill-all-buffers (&optional bang)
+  "Kill all buffers. If BANG, kill current session too."
+  (interactive "<!>")
+  (if bang
+      (+workspace/kill-session)
+    (doom/kill-all-buffers)))
+
+;;;###autoload (autoload '+hlissner:kill-matching-buffers "private/hlissner/autoload/evil" nil t)
+(evil-define-command +hlissner:kill-matching-buffers (&optional bang pattern)
+  "Kill all buffers matching PATTERN regexp. If BANG, only match project
+buffers."
+  (interactive "<a>")
+  (doom/kill-matching-buffers pattern bang))