Better magit+shackle integration

core/autoload/buffers.el

@@ -65,11 +65,16 @@ the current workspace."
   (cl-remove-if-not #'doom-real-buffer-p (or buffer-list (doom-buffer-list))))
 
 ;;;###autoload
-(defun doom-buffers-in-mode (modes &optional buffer-list)
+(defun doom-buffers-in-mode (modes &optional buffer-list derived-p)
   "Get a list of all buffers (in the current workspace OR in BUFFER-LIST) whose
 `major-mode' is one of MODES."
   (let ((modes (if (listp modes) modes (list modes))))
-    (cl-remove-if-not (lambda (buf) (memq (buffer-local-value 'major-mode buf) modes))
+    (cl-remove-if-not (if derived-p
+                          (lambda (buf)
+                            (with-current-buffer buf
+                              (apply #'derived-mode-p modes)))
+                        (lambda (buf)
+                          (memq (buffer-local-value 'major-mode buf) modes)))
                       (or buffer-list (doom-buffer-list)))))
 
 ;;;###autoload

core/autoload/popups.el

@@ -23,6 +23,18 @@ current window if omitted."
    buffer
    nil (or plist (shackle-match buffer))))
 
+;;;###autoload
+(defun doom-popup-switch-to-buffer (buffer)
+  (unless (doom-popup-p)
+    (let ((popups (doom-popup-windows)))
+      (unless popups
+        (error "No popups to switch"))
+      (select-window (car popups))))
+  (set-window-dedicated-p nil nil)
+  (switch-to-buffer buffer nil t)
+  (prog1 (selected-window)
+    (set-window-dedicated-p nil t)))
+
 ;;;###autoload
 (defun doom-popup-file (file &rest plist)
   "Display FILE in a shackle popup, with PLIST rules. See `shackle-rules' for