From: Leo Vivier <leo.vivier+dev@gmail.com>
Date: Thu, 14 May 2020 22:03:18 +0000 (+0200)
Subject: Fix dired default file operation (bug#41261)
X-Git-Tag: emacs-27.1-rc1~127
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e75f6be6cc117b0a30158a47c3231035f8ccdc20;p=emacs.git

Fix dired default file operation (bug#41261)

* lisp/dired-aux.el (dired-dwim-target-directories): Restore
pre-emacs-27 behavior of 'dired-dwim-target'.
---

diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index 0069c1744dc..7f988540c2c 100644
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -2002,10 +2002,9 @@ Optional arg HOW-TO determines how to treat the target.
    (format prompt (dired-mark-prompt arg files)) dir default))
 
 (defun dired-dwim-target-directories ()
-  (cond ((functionp dired-dwim-target)
-         (funcall dired-dwim-target))
-        (dired-dwim-target
-         (dired-dwim-target-next))))
+  (if (functionp dired-dwim-target)
+      (funcall dired-dwim-target)
+    (dired-dwim-target-next)))
 
 (defun dired-dwim-target-next (&optional all-frames)
   ;; Return directories from all next windows with dired-mode buffers.