1 files changed, 23 insertions, 20 deletions

diff --git a/src/process.c b/src/process.c
index 91bc090e76e..307eab3ab30 100644
--- a/src/process.c
+++ b/src/process.c
@@ -1333,15 +1333,15 @@ Returns nil if format of ADDRESS is invalid.  */)
 
       for (i = 0; i < nargs; i++)
         {
-          if (! RANGED_INTEGERP (0, p->u.contents[i], 65535))
+          if (! RANGED_INTEGERP (0, p->contents[i], 65535))
             return Qnil;
 
           if (nargs <= 5         /* IPv4 */
               && i < 4           /* host, not port */
-              && XINT (p->u.contents[i]) > 255)
+              && XINT (p->contents[i]) > 255)
             return Qnil;
 
-          args[i+1] = p->u.contents[i];
+          args[i+1] = p->contents[i];
         }
 
       return Fformat (nargs+1, args);
@@ -1983,7 +1983,7 @@ conv_sockaddr_to_lisp (struct sockaddr *sa, int len)
         len = sizeof (sin->sin_addr) + 1;
         address = Fmake_vector (make_number (len), Qnil);
         p = XVECTOR (address);
-        p->u.contents[--len] = make_number (ntohs (sin->sin_port));
+        p->contents[--len] = make_number (ntohs (sin->sin_port));
         cp = (unsigned char *) &sin->sin_addr;
         break;
       }
@@ -1995,9 +1995,9 @@ conv_sockaddr_to_lisp (struct sockaddr *sa, int len)
         len = sizeof (sin6->sin6_addr)/2 + 1;
         address = Fmake_vector (make_number (len), Qnil);
         p = XVECTOR (address);
-        p->u.contents[--len] = make_number (ntohs (sin6->sin6_port));
+        p->contents[--len] = make_number (ntohs (sin6->sin6_port));
         for (i = 0; i < len; i++)
-          p->u.contents[i] = make_number (ntohs (ip6[i]));
+          p->contents[i] = make_number (ntohs (ip6[i]));
         return address;
       }
 #endif
@@ -2022,7 +2022,7 @@ conv_sockaddr_to_lisp (struct sockaddr *sa, int len)
 
   i = 0;
   while (i < len)
-    p->u.contents[i++] = make_number (*cp++);
+    p->contents[i++] = make_number (*cp++);
 
   return address;
 }
@@ -2093,7 +2093,7 @@ conv_lisp_to_sockaddr (int family, Lisp_Object address, struct sockaddr *sa, int
         {
           struct sockaddr_in *sin = (struct sockaddr_in *) sa;
           len = sizeof (sin->sin_addr) + 1;
-          hostport = XINT (p->u.contents[--len]);
+          hostport = XINT (p->contents[--len]);
           sin->sin_port = htons (hostport);
           cp = (unsigned char *)&sin->sin_addr;
           sa->sa_family = family;
@@ -2104,12 +2104,12 @@ conv_lisp_to_sockaddr (int family, Lisp_Object address, struct sockaddr *sa, int
           struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *) sa;
           uint16_t *ip6 = (uint16_t *)&sin6->sin6_addr;
           len = sizeof (sin6->sin6_addr) + 1;
-          hostport = XINT (p->u.contents[--len]);
+          hostport = XINT (p->contents[--len]);
           sin6->sin6_port = htons (hostport);
           for (i = 0; i < len; i++)
-            if (INTEGERP (p->u.contents[i]))
+            if (INTEGERP (p->contents[i]))
               {
-                int j = XFASTINT (p->u.contents[i]) & 0xffff;
+                int j = XFASTINT (p->contents[i]) & 0xffff;
                 ip6[i] = ntohs (j);
               }
           sa->sa_family = family;
@@ -2140,8 +2140,8 @@ conv_lisp_to_sockaddr (int family, Lisp_Object address, struct sockaddr *sa, int
     }
 
   for (i = 0; i < len; i++)
-    if (INTEGERP (p->u.contents[i]))
-      *cp++ = XFASTINT (p->u.contents[i]) & 0xff;
+    if (INTEGERP (p->contents[i]))
+      *cp++ = XFASTINT (p->contents[i]) & 0xff;
 }
 
 #ifdef DATAGRAM_SOCKETS
@@ -3723,7 +3723,9 @@ network_interface_info (Lisp_Object ifname)
 
       any = 1;
       for (n = 0; n < 6; n++)
-        p->u.contents[n] = make_number (((unsigned char *)&rq.ifr_hwaddr.sa_data[0])[n]);
+        p->contents[n] = make_number (((unsigned char *)
+                                       &rq.ifr_hwaddr.sa_data[0])
+                                      [n]);
       elt = Fcons (make_number (rq.ifr_hwaddr.sa_family), hwaddr);
     }
 #elif defined (HAVE_GETIFADDRS) && defined (LLADDR)
@@ -3746,7 +3748,7 @@ network_interface_info (Lisp_Object ifname)
 
           memcpy (linkaddr, LLADDR (sdl), sdl->sdl_alen);
           for (n = 0; n < 6; n++)
-            p->u.contents[n] = make_number (linkaddr[n]);
+            p->contents[n] = make_number (linkaddr[n]);
 
           elt = Fcons (make_number (it->ifa_addr->sa_family), hwaddr);
           break;
@@ -4607,7 +4609,7 @@ wait_reading_process_output (intmax_t time_limit, int nsecs, int read_kbd,
                       {
                         struct Lisp_Process *p =
                           XPROCESS (chan_process[channel]);
-                        if (p && p->gnutls_p && p->infd
+                        if (p && p->gnutls_p && p->gnutls_state && p->infd
                             && ((emacs_gnutls_record_check_pending
                                  (p->gnutls_state))
                                 > 0))
@@ -4621,6 +4623,7 @@ wait_reading_process_output (intmax_t time_limit, int nsecs, int read_kbd,
                 {
                   /* Check this specific channel. */
                   if (wait_proc->gnutls_p /* Check for valid process.  */
+                      && wait_proc->gnutls_state
                       /* Do we have pending data?  */
                       && ((emacs_gnutls_record_check_pending
                            (wait_proc->gnutls_state))
@@ -5002,7 +5005,7 @@ read_process_output (Lisp_Object proc, register int channel)
           proc_buffered_char[channel] = -1;
         }
 #ifdef HAVE_GNUTLS
-      if (p->gnutls_p)
+      if (p->gnutls_p && p->gnutls_state)
         nbytes = emacs_gnutls_read (p, chars + carryover + buffered,
                                     readmax - buffered);
       else
@@ -5243,7 +5246,7 @@ DEFUN ("internal-default-process-filter", Finternal_default_process_filter,
       else
         set_marker_both (p->mark, p->buffer, PT, PT_BYTE);
 
-      update_mode_lines++;
+      update_mode_lines = 23;
 
       /* Make sure opoint and the old restrictions
          float ahead of any new text just as point would.  */
@@ -5496,7 +5499,7 @@ send_process (Lisp_Object proc, const char *buf, ptrdiff_t len,
 #endif
             {
 #ifdef HAVE_GNUTLS
-              if (p->gnutls_p)
+              if (p->gnutls_p && p->gnutls_state)
                 written = emacs_gnutls_write (p, cur_buf, cur_len);
               else
 #endif
@@ -6387,7 +6390,7 @@ status_notify (struct Lisp_Process *deleting_process)
         }
     } /* end for */
 
-  update_mode_lines++;  /* In case buffers use %s in mode-line-format.  */
+  update_mode_lines = 24;  /* In case buffers use %s in mode-line-format.  */
   UNGCPRO;
 }