Merge from origin/emacs-26

7ba8f80398 Avoid errors in 'rmail-get-new-mail'
9c8412a0b8 Fix process-contact bug with TCP connections

# Conflicts:
#	src/process.c

diff --cc lisp/mail/rmail.el
Simple merge

diff --cc src/process.c
index c0741403b576e269d905c03ea22011a3e06c10c1,d8acd139c00d46a28b4ff764a9e23e3a80316ed8..728c14a7624baf1a12e390dee876b8f397281b78
--- 1/src/process.c
--- 2/src/process.c
+++ b/src/process.c
@@@ -4749,11 -4736,12 +4753,12 @@@ server_accept_connection (Lisp_Object s
      case AF_INET:
        {
        args[nargs++] = procname_format_in;
-       nargs++;
+       args[nargs++] = host_format_in;
        unsigned char *ip = (unsigned char *)&saddr.in.sin_addr.s_addr;
 -      service = make_number (ntohs (saddr.in.sin_port));
 +      service = make_fixnum (ntohs (saddr.in.sin_port));
        for (int i = 0; i < 4; i++)
 -        args[nargs++] = make_number (ip[i]);
 +        args[nargs++] = make_fixnum (ip[i]);
+       host = Fformat (5, args + 1);
        args[nargs++] = service;
        }
        break;
@@@ -4762,11 -4750,12 +4767,12 @@@
      case AF_INET6:
        {
        args[nargs++] = procname_format_in6;
-       nargs++;
+       args[nargs++] = host_format_in6;
        DECLARE_POINTER_ALIAS (ip6, uint16_t, &saddr.in6.sin6_addr);
 -      service = make_number (ntohs (saddr.in.sin_port));
 +      service = make_fixnum (ntohs (saddr.in.sin_port));
        for (int i = 0; i < 8; i++)
 -        args[nargs++] = make_number (ip6[i]);
 +        args[nargs++] = make_fixnum (ip6[i]);
+       host = Fformat (9, args + 1);
        args[nargs++] = service;
        }
        break;