diff options
author | Jared Finder <jared@finder.org> | 2023-12-16 12:10:03 -0800 |
---|---|---|
committer | Eli Zaretskii <eliz@gnu.org> | 2023-12-25 15:02:34 +0200 |
commit | fcbb00448998cdfffcf7455192bfebf98ef27a1e (patch) | |
tree | 38828540a5c2a8ab78884831289d6eeb21ac41e1 | |
parent | be8a7155b48198b08bbc4844b2ce60c127405fb7 (diff) | |
download | emacs-fcbb00448998cdfffcf7455192bfebf98ef27a1e.tar.gz emacs-fcbb00448998cdfffcf7455192bfebf98ef27a1e.tar.bz2 emacs-fcbb00448998cdfffcf7455192bfebf98ef27a1e.zip |
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)
-rw-r--r-- | lisp/dired.el | 15 |
1 files changed, 12 insertions, 3 deletions
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 |