commit 3d42272754db914d4f2dbbcfba5ce6776a7b232b (HEAD, refs/remotes/origin/master)
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Tue Feb 20 05:58:58 2018 +0200

    Add assertion to guard 'read' calls on MS-Windows
    
    * src/sysdep.c (emacs_intr_read): Assert that NBYTES never
    overflows a 32-bit int.

diff --git a/src/sysdep.c b/src/sysdep.c
index bc34d8dc05..08db376b26 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -2566,6 +2566,14 @@ emacs_intr_read (int fd, void *buf, ptrdiff_t nbyte, bool interruptible)
 
   /* There is no need to check against MAX_RW_COUNT, since no caller ever
      passes a size that large to emacs_read.  */
+#ifdef WINDOWSNT
+  /* On MS-Windows, 'read's last argument is declared as 'unsigned
+     int', and the return value's type (see 'sys_read') is 'int'.
+     This might cause trouble, especially in 64-bit builds, if the
+     above comment ever becomes incorrect.  The following assertion
+     should make us more future-proof.  */
+  eassert (nbyte <= INT_MAX);
+#endif
   do
     {
       if (interruptible)

commit 071a0a571243f9498e0e58e5fe938a7b892a22db
Author: Michael Albinus <michael.albinus@gmx.de>
Date:   Mon Feb 19 19:44:57 2018 +0100

    Add ".xpi" to Tramp file archives
    
    * doc/misc/tramp.texi (Archive file names):
    * tramp-archive.el (tramp-archive-suffixes): Add ".xpi".

diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index d91c4a9bb3..6ad21359e9 100644
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -3095,6 +3095,11 @@ macOS XAR archives
 @cindex @file{xar} file archive suffix
 @cindex file archive suffix @file{xar}
 
+@item @samp{.xpi} ---
+XPInstall Mozilla addons
+@cindex @file{xpi} file archive suffix
+@cindex file archive suffix @file{xpi}
+
 @item @samp{.xps} ---
 Open XML Paper Specification (OpenXPS) documents
 @cindex @file{xps} file archive suffix
diff --git a/lisp/net/tramp-archive.el b/lisp/net/tramp-archive.el
index c859ca147e..2ed803a7dd 100644
--- a/lisp/net/tramp-archive.el
+++ b/lisp/net/tramp-archive.el
@@ -68,6 +68,7 @@
 ;; * ".tar", "tbz", "tgz", "tlz", "txz" - (Compressed) tape archives
 ;; * ".warc" - Web archives
 ;; * ".xar" - macOS XAR archives
+;; * ".xpi" - XPInstall Mozilla addons
 ;; * ".xps" - Open XML Paper Specification (OpenXPS) documents
 ;; * ".zip", ".ZIP" - ZIP archives
 
@@ -146,6 +147,7 @@
     "tar" "tbz" "tgz" "tlz" "txz" ;; (Compressed) tape archives.
     "warc" ;; Web archives.
     "xar" ;; macOS XAR archives.  Not in libarchive testsuite.
+    "xpi" ;; XPInstall Mozilla addons.  Not in libarchive testsuite.
     "xps" ;; Open XML Paper Specification (OpenXPS) documents.
     "zip" "ZIP") ;; ZIP archives.
   "List of suffixes which indicate a file archive.

commit 254a49f49eadc6b870fdca447533ba09004a28b2
Author: Michael Albinus <michael.albinus@gmx.de>
Date:   Mon Feb 19 19:41:15 2018 +0100

    ; Add changes in tramp.texi which were conflicted in merge from emacs-26

diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index 0dd82c582c..d91c4a9bb3 100644
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -2245,12 +2245,12 @@ Some older versions of Cygwin's @command{ssh} work with the
 @option{sshx} access method.  Consult Cygwin's FAQ at
 @uref{https://cygwin.com/faq/} for details.
 
-@cindex cygwin and fakecygpty
-@cindex fakecygpty and cygwin
+@cindex cygwin and @command{fakecygpty}
+@cindex @command{fakecygpty} and cygwin
 
 On @uref{https://www.emacswiki.org/emacs/SshWithNTEmacs, the Emacs
-Wiki} it is explained how to use the helper program @code{fakecygpty}
-to fix this problem.
+Wiki} it is explained how to use the helper program
+@command{fakecygpty} to fix this problem.
 
 @cindex method @option{scpx} with cygwin
 @cindex @option{scpx} method with cygwin
@@ -2264,7 +2264,7 @@ for a host named @code{c}.
 A workaround: write a wrapper script for @option{scp} to convert
 Windows file names to Cygwin file names.
 
-@cindex cygwin and ssh-agent
+@cindex cygwin and @command{ssh-agent}
 @cindex @env{SSH_AUTH_SOCK} and emacs on ms windows
 
 When using the @command{ssh-agent} on MS Windows for password-less