From: Jared Finder <jared@finder.org>
Date: Sat, 16 Dec 2023 20:10:03 +0000 (-0800)
Subject: Fix mouse clicks on directory line in Dired
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=fcbb00448998cdfffcf7455192bfebf98ef27a1e;p=emacs.git

Fix mouse clicks on directory line in Dired

The option 'dired-kill-when-opening-new-dired-buffer' should be
also honored when clicking the mouse to kill prev buffer.
* lisp/dired.el (dired--make-directory-clickable): Call
'dired--find-possibly-alternative-file' instead of 'dired', in
the click callback.  (Bug#67856)
---

diff --git a/lisp/dired.el b/lisp/dired.el
index cc548baf080..998de06ee63 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -1941,9 +1941,18 @@ mouse-2: visit this file in other window"
               keymap ,(let* ((current-dir dir)
                              (click (lambda ()
                                       (interactive)
-                                      (if (assoc current-dir dired-subdir-alist)
-                                          (dired-goto-subdir current-dir)
-                                        (dired current-dir)))))
+                                      (cond
+                                       ((assoc current-dir dired-subdir-alist)
+                                        (dired-goto-subdir current-dir))
+                                       ;; If there is a wildcard character in the directory, don't
+                                       ;; use the alternate file machinery which tries to keep only
+                                       ;; one dired buffer open at once.
+                                       ;;
+                                       ;; FIXME: Is this code path reachable?
+                                       ((insert-directory-wildcard-in-dir-p current-dir)
+                                        (dired current-dir))
+                                       (t
+                                        (dired--find-possibly-alternative-file current-dir))))))
                         (define-keymap
                           "<mouse-2>" click
                           "<follow-link>" 'mouse-face