Merge from origin/emacs-27

a5f7c26907 (origin/emacs-27) * admin/authors.el: Add an author alias.
d87a4d1f4e Limit RLIMIT_NOFILE to FD_SETSIZE on macOS
e5ca8e5e73 Fix Elisp manual entry on 'set-window-configuration'
485f24223f ; Update ChangeLog.3
8f200254fb ; Update etc/AUTHORS
c7adc851ad * admin/authors.el: Add missing author aliases.
4acdd7fe58 Fix edge case errors in filename-matching regexps
5f36e21fe5 Clarify the doc string of 'yank'
13301d4266 New function erc-track-switch-buffer-other-window
38f7538d8f New function erc-switch-to-buffer-other-window

# Conflicts:
#	etc/NEWS

2 files changed, 2 insertions, 2 deletions

diff --git a/test/lisp/net/tramp-archive-tests.el b/test/lisp/net/tramp-archive-tests.el
index b3fc129ef08..8c75d91bb58 100644
--- a/test/lisp/net/tramp-archive-tests.el
+++ b/test/lisp/net/tramp-archive-tests.el
@@ -668,7 +668,7 @@ This tests also `access-file', `file-readable-p' and `file-regular-p'."
           (setq attr (directory-files-and-attributes tmp-name 'full))
           (dolist (elt attr)
             (should (equal (file-attributes (car elt)) (cdr elt))))
-          (setq attr (directory-files-and-attributes tmp-name nil "^b"))
+          (setq attr (directory-files-and-attributes tmp-name nil "\\`b"))
           (should (equal (mapcar #'car attr) '("bar"))))
 
       ;; Cleanup.
diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index 7db9ad42f1b..49668258407 100644
--- a/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@ -3350,7 +3350,7 @@ They might differ only in time attributes or directory size."
                (tramp--test-file-attributes-equal-p
                 (file-attributes (car elt)) (cdr elt))))
 
-            (setq attr (directory-files-and-attributes tmp-name2 nil "^b"))
+            (setq attr (directory-files-and-attributes tmp-name2 nil "\\`b"))
             (should (equal (mapcar #'car attr) '("bar" "boz"))))
 
         ;; Cleanup.