From e092f60878f8dfb5fd2e7bcf4a6b047b5f6e4671 Mon Sep 17 00:00:00 2001
From: Chris Barrett <chris@walrus.cool>
Date: Sun, 12 Mar 2023 13:38:07 +1300
Subject: [PATCH] Replace custom buffer display function with direct
 display-buffer calls

---
 lisp/org-roam-links.el   |  2 +-
 lisp/org-roam-review.el  | 14 ++++----------
 lisp/org-roam-search.el  |  4 ++--
 lisp/org-roam-slipbox.el |  2 +-
 4 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/lisp/org-roam-links.el b/lisp/org-roam-links.el
index 7cb0401..48e200e 100644
--- a/lisp/org-roam-links.el
+++ b/lisp/org-roam-links.el
@@ -82,7 +82,7 @@ When called interactively, prompt the user for MAX-DEPTH."
           (short-title (substring title 0 (min (length title) org-roam-links-max-title-length)))
           (short-title (if (equal title short-title) title (concat short-title "…")))
           graph)
-    (org-roam-review-display-buffer-and-select
+    (display-buffer
      (org-roam-review-create-buffer
       :title (format "Links for “%s\”" short-title)
       :instructions "Below is the graph of links to and from the current node."
diff --git a/lisp/org-roam-review.el b/lisp/org-roam-review.el
index 293ab72..46db9a6 100644
--- a/lisp/org-roam-review.el
+++ b/lisp/org-roam-review.el
@@ -520,12 +520,6 @@ categorised by their maturity."
     ('evergreen (cons "Evergreen 🌲" 1))
     (value value)))
 
-(defun org-roam-review-display-buffer-and-select (buf)
-  (display-buffer buf)
-  (when-let* ((win (seq-find (lambda (it) (equal buf (window-buffer it)))
-                             (window-list))))
-    (select-window win)))
-
 (defun org-roam-review-node-due-p (node)
   (when-let* ((next-review (org-roam-review-node-next-review node)))
     (ts<= next-review (ts-now))))
@@ -534,7 +528,7 @@ categorised by their maturity."
 (defun org-roam-review-list-due ()
   "List nodes that are due for review."
   (interactive)
-  (org-roam-review-display-buffer-and-select
+  (display-buffer
    (org-roam-review-create-buffer
     :title "Due Notes"
     :instructions "The nodes below are due for review.
@@ -560,7 +554,7 @@ them as reviewed with `org-roam-review-accept',
 (defun org-roam-review-list-by-maturity ()
   "List all evergreen nodes categorised by maturity."
   (interactive)
-  (org-roam-review-display-buffer-and-select
+  (display-buffer
    (org-roam-review-create-buffer
     :title "Evergreen Notes"
     :instructions "The nodes below are categorised by maturity."
@@ -582,7 +576,7 @@ them as reviewed with `org-roam-review-accept',
 (defun org-roam-review-list-recently-added ()
   "List nodes that were created recently, grouped by time."
   (interactive)
-  (org-roam-review-display-buffer-and-select
+  (display-buffer
    (org-roam-review-create-buffer
     :title "Recently Created Notes"
     :instructions "The nodes below are sorted by when they were created."
@@ -594,7 +588,7 @@ them as reviewed with `org-roam-review-accept',
 
 (defun org-roam-review--update-workspace-for-completed-review ()
   (when-let* ((buf (get-buffer "*org-roam-review*")))
-    (org-roam-review-display-buffer-and-select buf)))
+    (display-buffer buf)))
 
 (defmacro org-roam-review--visiting-node-at-point (&rest body)
   (declare (indent 0))
diff --git a/lisp/org-roam-search.el b/lisp/org-roam-search.el
index 7e2499b..3c7050e 100644
--- a/lisp/org-roam-search.el
+++ b/lisp/org-roam-search.el
@@ -207,7 +207,7 @@ QUERY is a PRCE regexp string that will be passed to ripgrep."
                       (format "(%s)" input)
                     input))))
   (let ((nodes (org-roam-search--ripgrep-for-nodes query)))
-    (org-roam-review-display-buffer-and-select
+    (display-buffer
      (org-roam-review-create-buffer
       :title (concat "Search Results: " (propertize query 'face 'org-roam-search-query))
       :placeholder "No search results"
@@ -249,7 +249,7 @@ QUERY is a PRCE regexp string that will be passed to ripgrep."
 QUERY is an `org-tags-filter'."
   (interactive (list (org-tags-filter-read "Search by tags filter (+/-): ")))
   (org-roam-review-modify-tags query t)
-  (org-roam-review-display-buffer-and-select
+  (display-buffer
    (org-roam-review-create-buffer
     :title "Tag Search Results"
     :instructions "The list below contains nodes matching the given tags."
diff --git a/lisp/org-roam-slipbox.el b/lisp/org-roam-slipbox.el
index b25d532..507f8b8 100644
--- a/lisp/org-roam-slipbox.el
+++ b/lisp/org-roam-slipbox.el
@@ -261,7 +261,7 @@ This means titles can be restored if
 (defun org-roam-slipbox-list-notes (slipbox)
   "List nodes belonging to SLIPBOX."
   (interactive (list (org-roam-slipbox--read)))
-  (org-roam-review-display-buffer-and-select
+  (display-buffer
    (org-roam-review-create-buffer
     :title (concat "Notes for slipbox: " (propertize slipbox 'face 'org-roam-slipbox-name))
     :instructions "The nodes below are sorted by slipbox"