2 files changed, 20 insertions, 1 deletions

@@ -238,7 +238,8 @@
            "M-/" hippie-expand
            "M-=" count-words
            "C-x C-b" ibuffer
-           "C-c i" acdw/find-emacs-dotfiles))
+           "C-c i" acdw/find-emacs-dotfiles
+           "C-x k" acdw/kill-a-buffer))
 
 ;; Regular modes (`text-mode', `prog-mode', etc.)
 (defun acdw/setup-regular-modes ()
@@ -126,6 +126,24 @@ if MAKE-DIRECTORY is non-nil."
                               (directory-files-recursively
                                user-emacs-directory "\.el$"))))
 
+(defun acdw/kill-a-buffer (&optional prefix)
+  "Kill a buffer based on the following rules:
+
+C-x k         => Kill CURRENT buffer and window
+C-u C-x k     => Kill OTHER buffer and window
+C-u C-u C-x k => Kill ALL OTHER buffers and windows
+
+Prompt only if there are unsaved changes."
+  (interactive "P")
+  (pcase (or (car prefix) 0)
+    (0  (kill-current-buffer)
+        (unless (one-window-p) (delete-window)))
+    (4  (other-window 1)
+        (kill-current-buffer)
+        (unless (one-window-p) (delete-window)))
+    (16 (mapc 'kill-buffer (delq (current-) (buffer-list)))
+        (delete-other-windows))))
+
 
 ;; Make `C-z' more useful
 (defvar acdw/leader