Merge remote-tracking branch 'origin/master' into feature/tramp-thread-safe

diff --cc doc/lispref/commands.texi
Simple merge

diff --cc doc/lispref/elisp.texi
Simple merge

diff --cc doc/lispref/files.texi
Simple merge

diff --cc doc/misc/tramp.texi
Simple merge

diff --cc etc/NEWS
index f06d08317e7c4de6e335ad7b36b397972da41190,7e7de165ec1eeb0277e8e281ebb4ac2b64175b84..a33296c15ddca64b0ef4ce54b4812501c8e4747e
--- 1/etc/NEWS
--- 2/etc/NEWS
+++ b/etc/NEWS
@@@ -252,16 -273,12 +273,22 @@@ large files.  Now it also offers a thir
  file literally, as in 'find-file-literally', which speeds up
  navigation and editing of large files.
  
 ++++
 +** Files can be visited asynchronously.
 +If the new user option 'execute-file-commands-asynchronously' has a
 +non-nil value, interactive file visiting commands load the file
 +asynchronously into the respective buffer.  I.e., Emacs is still
 +responsive while loading the files, which is useful especially for
 +remote files.  If the value is a regular expression, files matching
 +this expression are loaded asynchronously.  See the node "(emacs)
 +Visiting" in the user manual for the supported commands.
 +
+ ---
+ ** add-dir-local-variable now uses dotted pair notation syntax
+ to write alists of variables to .dir-locals.el.  This is the same
+ syntax that you can see in the example of a .dir-locals.el file
+ in (info "(emacs) Directory Variables")
+ 
  \f
  * Changes in Specialized Modes and Packages in Emacs 27.1
  

diff --cc lisp/files.el
Simple merge

diff --cc lisp/net/tramp-compat.el
Simple merge

diff --cc lisp/net/tramp-sh.el
Simple merge

diff --cc lisp/net/tramp.el
Simple merge

diff --cc lisp/simple.el
Simple merge

diff --cc lisp/subr.el
Simple merge

diff --cc lisp/vc/vc-hooks.el
Simple merge

diff --cc test/lisp/net/tramp-tests.el
Simple merge