Updating Doom Emacs.

.emacs.d/core/autoload/buffers.el

@@ -36,7 +36,7 @@ it if it doesn't exist).")
 
 
 ;;
-;; Functions
+;;; Functions
 
 ;;;###autoload
 (defun doom-buffer-frame-predicate (buf)
@@ -139,6 +139,8 @@ If BUFFER-OR-NAME is omitted or nil, the current buffer is tested."
       (stringp buffer-or-name)
       (signal 'wrong-type-argument (list '(bufferp stringp) buffer-or-name)))
   (when-let (buf (get-buffer buffer-or-name))
+    (when-let (basebuf (buffer-base-buffer buf))
+      (setq buf basebuf))
     (and (buffer-live-p buf)
          (not (doom-temp-buffer-p buf))
          (or (buffer-local-value 'doom-real-buffer-p buf)
@@ -195,7 +197,9 @@ If DERIVED-P, test with `derived-mode-p', otherwise use `eq'."
 
 ;;;###autoload
 (defun doom-set-buffer-real (buffer flag)
-  "Forcibly mark BUFFER as FLAG (non-nil = real)."
+  "Forcibly mark BUFFER as FLAG (non-nil = real).
+
+See `doom-real-buffer-p' for an explanation for real buffers."
   (with-current-buffer buffer
     (setq doom-real-buffer-p flag)))
 
@@ -251,7 +255,9 @@ regex PATTERN. Returns the number of killed buffers."
 
 ;;;###autoload
 (defun doom-mark-buffer-as-real-h ()
-  "Hook function that marks the current buffer as real."
+  "Hook function that marks the current buffer as real.
+
+See `doom-real-buffer-p' for an explanation for real buffers."
   (doom-set-buffer-real (current-buffer) t))
 
 
@@ -272,6 +278,12 @@ If DONT-SAVE, don't prompt to save modified buffers (discarding their changes)."
       (set-buffer-modified-p nil)))
   (doom-kill-buffer-fixup-windows buffer))
 
+
+(defun doom--message-or-count (interactive message count)
+  (if interactive
+      (message message count)
+    count))
+
 ;;;###autoload
 (defun doom/kill-all-buffers (&optional buffer-list interactive)
   "Kill all buffers and closes their windows.
@@ -286,14 +298,14 @@ belong to the current project."
   (if (null buffer-list)
       (message "No buffers to kill")
     (save-some-buffers)
+    (delete-other-windows)
     (when (memq (current-buffer) buffer-list)
       (switch-to-buffer (doom-fallback-buffer)))
-    (mapc #'doom-kill-buffer-and-windows buffer-list)
-    (delete-other-windows)
-    (when interactive
-      (message "Killed %s buffers"
-               (- (length buffer-list)
-                  (length (cl-remove-if-not #'buffer-live-p buffer-list)))))))
+    (mapc #'kill-buffer buffer-list)
+    (doom--message-or-count
+     interactive "Killed %d buffers"
+     (- (length buffer-list)
+        (length (cl-remove-if-not #'buffer-live-p buffer-list))))))
 
 ;;;###autoload
 (defun doom/kill-other-buffers (&optional buffer-list interactive)
@@ -308,10 +320,10 @@ project."
                  (doom-buffer-list)))
          t))
   (mapc #'doom-kill-buffer-and-windows buffer-list)
-  (when interactive
-    (message "Killed %s buffers"
-             (- (length buffer-list)
-                (length (cl-remove-if-not #'buffer-live-p buffer-list))))))
+  (doom--message-or-count
+   interactive "Killed %d other buffers"
+   (- (length buffer-list)
+      (length (cl-remove-if-not #'buffer-live-p buffer-list)))))
 
 ;;;###autoload
 (defun doom/kill-matching-buffers (pattern &optional buffer-list interactive)
@@ -341,10 +353,10 @@ current project."
           (if current-prefix-arg (doom-project-buffer-list)))
          t))
   (mapc #'kill-buffer buffer-list)
-  (when interactive
-    (message "Killed %s buried buffers"
-             (- (length buffer-list)
-                (length (cl-remove-if-not #'buffer-live-p buffer-list))))))
+  (doom--message-or-count
+   interactive "Killed %d buried buffers"
+   (- (length buffer-list)
+      (length (cl-remove-if-not #'buffer-live-p buffer-list)))))
 
 ;;;###autoload
 (defun doom/kill-project-buffers (project &optional interactive)
@@ -362,9 +374,9 @@ current project."
            nil)
          t))
   (when project
-    (let ((buffers (doom-project-buffer-list project)))
-      (doom-kill-buffers-fixup-windows buffers)
-      (when interactive
-        (message "Killed %d buffer(s)"
-                 (- (length buffers)
-                    (length (cl-remove-if-not #'buffer-live-p buffers))))))))
+    (let ((buffer-list (doom-project-buffer-list project)))
+      (doom-kill-buffers-fixup-windows buffer-list)
+      (doom--message-or-count
+       interactive "Killed %d project buffers"
+       (- (length buffer-list)
+          (length (cl-remove-if-not #'buffer-live-p buffer-list)))))))