Re-fix previous `&' dired change

* lisp/dired-aux.el (dired-shell-stuff-it): Re-fix the previous
change -- the &wait was in the wrong place (bug#36331).

diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index a98425d129084bc7d18a9fd660ea1de6cec8166a..d87d617ed7f29b05fb10dbbc32d439c0cae8c9af 100644 (file)
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -998,13 +998,14 @@ Also see the `dired-confirm-shell-command' variable."
                                file-list dired-mark-separator)))
          (when (cdr file-list)
            (setq files (concat dired-mark-prefix files dired-mark-postfix)))
-         (funcall stuff-it files))))
-     (or (and in-background
-              (if (not w32-shell)
-                  ;; Work the same as the `on-each' case -- don't
-                  ;; accept user input in the output buffer.
-                  "&wait"
-                "&"))
+         (concat
+          (funcall stuff-it files)
+          ;; Be consistent in how we treat inputs to commands -- do
+          ;; the same here as in the `on-each' case.
+          (if (and in-background (not w32-shell))
+              "&wait"
+            "")))))
+     (or (and in-background "&")
          ""))))
 
 ;; This is an extra function so that it can be redefined by ange-ftp.