feature/android ab3ef576b4c: Merge remote-tracking branch 'origin/master' into feature/android

[Po Lu]

branch: feature/android
commit ab3ef576b4c529aad7461283cea9bda67c7c8bcd
Merge: 956cb8ca65b 560c27a332c
Author: Po Lu <luangruo@yahoo.com>
Commit: Po Lu <luangruo@yahoo.com>

    Merge remote-tracking branch 'origin/master' into feature/android
---
 test/lisp/dired-aux-tests.el | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/test/lisp/dired-aux-tests.el b/test/lisp/dired-aux-tests.el
index 5939f480680..62011d8b0f0 100644
--- a/test/lisp/dired-aux-tests.el
+++ b/test/lisp/dired-aux-tests.el
@@ -55,12 +55,11 @@
            (setq to-mv
                  (expand-file-name
                   "foo-mv" (file-name-as-directory (expand-file-name "qux" 
,foo))))
-           (unwind-protect
-               (if ,yes-or-no
-                   (cl-letf (((symbol-function 'yes-or-no-p)
-                              (lambda (_prompt) (eq ,yes-or-no 'yes))))
-                     ,@body)
-                 ,@body)))))))
+           (if ,yes-or-no
+               (cl-letf (((symbol-function 'yes-or-no-p)
+                          (lambda (_prompt) (eq ,yes-or-no 'yes))))
+                 ,@body)
+             ,@body))))))
 
 (ert-deftest dired-test-bug28834 ()
   "test for https://debbugs.gnu.org/28834 ."