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

[Eli Zaretskii]

branch: master
commit ed1045613e2cc5de5bba8bad05d7ebdf070ffe86
Merge: 609c9c5cd9 aea843c3d6
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>

    Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs
---
 test/src/buffer-tests.el | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/test/src/buffer-tests.el b/test/src/buffer-tests.el
index f6a18acaa6..13d48b31a4 100644
--- a/test/src/buffer-tests.el
+++ b/test/src/buffer-tests.el
@@ -1515,7 +1515,11 @@ with parameters from the *Messages* buffer modification."
       (should (eq (buffer-modified-p) 'autosaved))
       (insert "zot")
       (restore-buffer-modified-p 'autosaved)
-      (should (eq (buffer-modified-p) 'autosaved))))
+      (should (eq (buffer-modified-p) 'autosaved))
+
+      ;; Clean up.
+      (when (file-exists-p buffer-auto-save-file-name)
+        (delete-file buffer-auto-save-file-name))))
 
   (ert-with-temp-file file
     (with-current-buffer (find-file file)