Merge from origin/emacs-26

fc5b8f1 Fix Bug#29149
5622b2e Merge branch 'emacs-26' of git.sv.gnu.org:/srv/git/emacs into...
4da8799 (emacs-26) Fix misbehavior when drawing three-pixel high hori...
1b082c8 MH-E: don't automatically download external-body parts
069f978 ; * lisp/emacs-lisp/byte-run.el: Fix a typo in a comment.
504a56c ; Fix last commit
a34e44e ; Fix last commit
a8892b4 Further fix for Bug#29291
d14923b Fix divider frame params on NS (bug#29352)
b2518ac Spelling fixes

# Conflicts:
#	etc/NEWS
#	test/lisp/net/tramp-tests.el

1 files changed, 4 insertions, 3 deletions

diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index bfc62049ccd..491ff60e3e8 100644
--- a/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@ -2983,9 +2983,10 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'."
             (set-file-modes tmp-name3 #o444)
             (should-not
              (string-equal (file-acl tmp-name1) (file-acl tmp-name3)))
-            ;; Copy ACL.
-            (file-acl tmp-name1) (file-acl tmp-name3)
-            (should (string-equal (file-acl tmp-name1) (file-acl tmp-name3))))
+            ;; Copy ACL.  Since we don't know whether Emacs is built
+            ;; with local ACL support, we must check it.
+            (when (set-file-acl tmp-name3 (file-acl tmp-name1))
+              (should (string-equal (file-acl tmp-name1) (file-acl tmp-name3))))
 
             ;; Two files with same ACLs.
             (delete-file tmp-name1)