From 34137d8359f4599bc4bc064b31b1a741ea040984 Mon Sep 17 00:00:00 2001
From: "Samuel W. Flint" <swflint@flintfam.org>
Date: Thu, 9 Mar 2023 10:03:44 -0600
Subject: [PATCH] Use with-help-window to make the explanation buffer easily
 quittable

---
 elfeed-score-scoring.el   | 36 +++++++++++++++++-------------------
 elfeed-score.el           |  6 ++++--
 test/test-explanations.el |  2 +-
 3 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/elfeed-score-scoring.el b/elfeed-score-scoring.el
index cef521d..1754a58 100644
--- a/elfeed-score-scoring.el
+++ b/elfeed-score-scoring.el
@@ -707,8 +707,8 @@ This function is used in `elfeed-new-entry-hook'."
     (t
      (error "Don't know how to evaluate %S" match))))
 
-(defun elfeed-score-scoring-explain-entry (entry)
-  "Explain an Elfeed ENTRY.
+(defun elfeed-score-scoring-explain-entry (entry buffer)
+  "Explain an Elfeed ENTRY in BUFFER.
 
 This function will apply all scoring rules to an entry, but will
 not change anything (e.g.  update ENTRY's meta-data, or the
@@ -736,9 +736,7 @@ understanding of scoring rules."
            :initial-value elfeed-score-scoring-default-score))
          (sticky (and elfeed-score-scoring-manual-is-sticky
                       (elfeed-score-scoring-entry-is-sticky entry))))
-    (with-current-buffer-window
-        elfeed-score-scoring-explanation-buffer-name
-        nil nil
+    (with-current-buffer buffer
       (goto-char (point-max))
       (insert
        (if sticky
@@ -777,20 +775,20 @@ to the rules currently in-memory)\n")
                   (format "    %d. %s\n" (1+ idx)
                           (elfeed-score-scoring--pp-rule-match-to-string match)))))
             (cl-loop
-                 for match being the elements of matches using (index idx)
-                 do
-                 (insert
-                  (format "    %d. " (1+ idx)))
-                 (insert-text-button
-                  (elfeed-score-scoring--pp-rule-match-to-string match)
-                  'tag (elfeed-score-serde-tag-for-explanation match)
-                  'index (elfeed-score-rules-index-for-explanation match)
-                  'action
-                  (lambda (btn)
-                    (elfeed-score-scoring-visit-rule
-                     (button-get btn 'tag)
-                     (button-get btn 'index))))
-                 (insert "\n"))))))))
+             for match being the elements of matches using (index idx)
+             do
+             (insert
+              (format "    %d. " (1+ idx)))
+             (insert-text-button
+              (elfeed-score-scoring--pp-rule-match-to-string match)
+              'tag (elfeed-score-serde-tag-for-explanation match)
+              'index (elfeed-score-rules-index-for-explanation match)
+              'action
+              (lambda (btn)
+                (elfeed-score-scoring-visit-rule
+                 (button-get btn 'tag)
+                 (button-get btn 'index))))
+             (insert "\n"))))))))
 
 (defun elfeed-score-scoring-visit-rule (tag index)
   "Visit rule TAG, INDEX in the score file.
diff --git a/elfeed-score.el b/elfeed-score.el
index b24c6d0..d5bfccf 100644
--- a/elfeed-score.el
+++ b/elfeed-score.el
@@ -143,8 +143,10 @@ point will be explained.  If the region is not active, only the
 entry under point will be explained."
   (interactive)
   (let ((entries (elfeed-search-selected ignore-region)))
-    (dolist (entry entries)
-      (elfeed-score-scoring-explain-entry entry))
+    (with-help-window elfeed-score-scoring-explanation-buffer-name
+      (with-current-buffer elfeed-score-scoring-explanation-buffer-name
+        (dolist (entry entries)
+          (elfeed-score-scoring-explain-entry entry (current-buffer)))))
     (elfeed-search-update t)))
 
 (defun elfeed-score-load-score-file (score-file)
diff --git a/test/test-explanations.el b/test/test-explanations.el
index 1fc0e54..42e581a 100644
--- a/test/test-explanations.el
+++ b/test/test-explanations.el
@@ -62,7 +62,7 @@
               (list (elfeed-score-tag-rule--create :tags '(b c d) :value 1)))
              (elfeed-score-serde-udf-rules
               (list (elfeed-score-udf-rule--create :function (lambda (_) 1)))))
-        (elfeed-score-scoring-explain-entry entry)
+        (elfeed-score-scoring-explain-entry entry elfeed-score-scoring-explanation-buffer-name)
         (let ((text
                (with-current-buffer "*explanation-smoke-tests*"
                  (buffer-string))))