Merge remote-tracking branch 'origin/master' into feature/bignum

3 files changed, 18 insertions, 7 deletions

diff --git a/admin/MAINTAINERS b/admin/MAINTAINERS
index 753a676e81a..10633a8e0e8 100644
--- a/admin/MAINTAINERS
+++ b/admin/MAINTAINERS
@@ -37,7 +37,7 @@ Kenichi Handa
         Mule
 
 Stefan Monnier
-        src/regex.c
+        src/regex-emacs.c
         src/syntax.c
         src/keymap.c
         font-lock/jit-lock/syntax
@@ -61,7 +61,7 @@ Michael Albinus
             lisp/net/tramp*.el
             lisp/url/url-tramp.el
             doc/misc/tramp*.texi
-            test/lisp/net/tramp-tests.el
+            test/lisp/net/tramp*-tests.el
             test/lisp/url/url-tramp-tests.el
 
         D-Bus
@@ -210,11 +210,21 @@ Paul Eggert
 Michael Albinus
         src/inotify.c
         lisp/autorevert.el
+        lisp/files.el (file-name-non-special)
         lisp/eshell/em-tramp.el
+        lisp/net/ange-ftp.el
         lisp/notifications.el
+        lisp/shadowfile.el
         test/lisp/autorevert-tests.el
+        test/lisp/files-tests.el (file-name-non-special)
+        test/lisp/shadowfile-tests.el
         test/src/inotify-test.el
 
+        Secret Service API in
+            lisp/auth-source.el
+            doc/misc/auth.texi
+            test/lisp/auth-source-tests.el
+
 Nicolas Petton
         lisp/emacs-lisp/subr-x.el
         lisp/arc-mode.el
diff --git a/admin/find-gc.el b/admin/find-gc.el
index fb564039c7b..e8cc1136501 100644
--- a/admin/find-gc.el
+++ b/admin/find-gc.el
@@ -57,7 +57,7 @@ Each entry has the form (FUNCTION . FUNCTIONS-IT-CALLS).")
     "keymap.c" "sysdep.c" "buffer.c" "filelock.c"
     "insdel.c" "marker.c" "minibuf.c" "fileio.c"
     "dired.c" "cmds.c" "casefiddle.c"
-    "indent.c" "search.c" "regex.c" "undo.c"
+    "indent.c" "search.c" "regex-emacs.c" "undo.c"
     "alloc.c" "data.c" "doc.c" "editfns.c"
     "callint.c" "eval.c" "fns.c" "print.c" "lread.c"
     "syntax.c" "unexcoff.c"
diff --git a/admin/merge-gnulib b/admin/merge-gnulib
index 39dfaee8f4d..abb192911d9 100755
--- a/admin/merge-gnulib
+++ b/admin/merge-gnulib
@@ -35,9 +35,9 @@ GNULIB_MODULES='
   fcntl fcntl-h fdatasync fdopendir
   filemode filevercmp flexmember fpieee fstatat fsusage fsync
   getloadavg getopt-gnu gettime gettimeofday gitlog-to-changelog
-  ignore-value intprops largefile lstat
+  ieee754-h ignore-value intprops largefile lstat
   manywarnings memrchr minmax mkostemp mktime nstrftime
-  pipe2 pselect pthread_sigmask putenv qcopy-acl readlink readlinkat
+  pipe2 pselect pthread_sigmask putenv qcopy-acl readlink readlinkat regex
   sig2str socklen stat-time std-gnu11 stdalign stddef stdio
   stpcpy strtoimax symlink sys_stat sys_time
   tempname time time_r time_rz timegm timer-time timespec-add timespec-sub
@@ -46,11 +46,12 @@ GNULIB_MODULES='
 '
 
 AVOIDED_MODULES='
-  close dup fchdir fstat
-  malloc-posix msvc-inval msvc-nothrow
+  btowc close dup fchdir fstat langinfo lock
+  malloc-posix mbrtowc mbsinit msvc-inval msvc-nothrow nl_langinfo
   openat-die opendir raise
   save-cwd select setenv sigprocmask stat stdarg stdbool
   threadlib tzset unsetenv utime utime-h
+  wchar wcrtomb wctype-h
 '
 
 GNULIB_TOOL_FLAGS='