master 3e7a216 2/2: Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs

[Eli Zaretskii]

branch: master
commit 3e7a216b77c210ce91eb6973f91dbe862da5c746
Merge: dd79a50 fcb3990
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>

    Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs
---
 lisp/dired-aux.el | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index 0ac4e54..a1dda3f 100644
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -2179,20 +2179,21 @@ Optional arg HOW-TO determines how to treat the target.
           (error "%s: Target directory does not exist: %s" operation target))
       ;; rename-file bombs when moving directories unless we do this:
       (or into-dir (setq target (directory-file-name target)))
-      (dired-create-files
-       file-creator operation fn-list
-       (if into-dir                    ; target is a directory
-          ;; This function uses fluid variable target when called
-          ;; inside dired-create-files:
-          (lambda (from)
-            (expand-file-name (file-name-nondirectory from) target))
-        (lambda (_from) target))
-       marker-char)
-      (when (or (eq dired-do-revert-buffer t)
-                (and (functionp dired-do-revert-buffer)
-                     (funcall dired-do-revert-buffer target)))
-        (dired-fun-in-all-buffers (file-name-directory target) nil
-                                  #'revert-buffer)))))
+      (prog1
+          (dired-create-files
+           file-creator operation fn-list
+           (if into-dir                        ; target is a directory
+              ;; This function uses fluid variable target when called
+              ;; inside dired-create-files:
+              (lambda (from)
+                (expand-file-name (file-name-nondirectory from) target))
+            (lambda (_from) target))
+           marker-char)
+        (when (or (eq dired-do-revert-buffer t)
+                  (and (functionp dired-do-revert-buffer)
+                       (funcall dired-do-revert-buffer target)))
+          (dired-fun-in-all-buffers (file-name-directory target) nil
+                                    #'revert-buffer))))))
 
 ;; Read arguments for a marked-files command that wants a file name,
 ;; perhaps popping up the list of marked files.