emacs-27 29af10a: Backport: Fix exiting the finder-commentary buffer

[Stefan Kangas]

branch: emacs-27
commit 29af10afe8be0154a6ce2e538ff50aa1a174c9f0
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>

    Backport: Fix exiting the finder-commentary buffer
    
    Do not merge to master.
    
    * lisp/finder.el (finder-exit): Fix exiting the finder-commentary
    buffer.  (Bug#44384)
    (finder-buffer): New defconst.
    (finder-list-keywords): Use above new defconst.
---
 lisp/finder.el | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/lisp/finder.el b/lisp/finder.el
index 71f8ac7..5835144 100644
--- a/lisp/finder.el
+++ b/lisp/finder.el
@@ -178,6 +178,9 @@ directory name and PACKAGE is the name of a package (a 
symbol).
 When generating `package--builtins', Emacs assumes any file in
 DIR is part of the package PACKAGE.")
 
+(defconst finder-buffer "*Finder*"
+  "Name of the Finder buffer.")
+
 (defun finder-compile-keywords (&rest dirs)
   "Regenerate list of built-in Emacs packages.
 This recomputes `package--builtins' and `finder-keywords-hash',
@@ -338,9 +341,9 @@ not `finder-known-keywords'."
 (defun finder-list-keywords ()
   "Display descriptions of the keywords in the Finder buffer."
   (interactive)
-  (if (get-buffer "*Finder*")
-      (pop-to-buffer "*Finder*")
-    (pop-to-buffer (get-buffer-create "*Finder*"))
+  (if (get-buffer finder-buffer)
+      (pop-to-buffer finder-buffer)
+    (pop-to-buffer (get-buffer-create finder-buffer))
     (finder-mode)
     (let ((inhibit-read-only t))
       (erase-buffer)
@@ -467,10 +470,9 @@ finder directory, \\[finder-exit] = quit, 
\\[finder-summary] = help")))
   "Exit Finder mode.
 Quit the window and kill all Finder-related buffers."
   (interactive)
-  (let ((buf "*Finder*"))
-    (if (equal (current-buffer) buf)
-        (quit-window t)
-      (and (get-buffer buf) (kill-buffer buf)))))
+  (quit-window t)
+  (dolist (buf (list finder-buffer "*Finder-package*"))
+    (and (get-buffer buf) (kill-buffer buf))))
 
 (defun finder-unload-function ()
   "Unload the Finder library."