Merge from trunk.

1 files changed, 4 insertions, 6 deletions

diff --git a/src/process.c b/src/process.c
index b4fca389d0d..daa49b129ae 100644
--- a/src/process.c
+++ b/src/process.c
@@ -5046,9 +5046,8 @@ read_process_output (Lisp_Object proc, register int channel)
           proc_buffered_char[channel] = -1;
         }
 #ifdef HAVE_GNUTLS
-      if (XPROCESS (proc)->gnutls_p)
-        nbytes = emacs_gnutls_read (XPROCESS (proc),
-                                    chars + carryover + buffered,
+      if (p->gnutls_p)
+        nbytes = emacs_gnutls_read (p, chars + carryover + buffered,
                                     readmax - buffered);
       else
 #endif
@@ -5513,9 +5512,8 @@ send_process (volatile Lisp_Object proc, const char *volatile buf,
 #endif
                 {
 #ifdef HAVE_GNUTLS
-                  if (XPROCESS (proc)->gnutls_p)
-                    written = emacs_gnutls_write (XPROCESS (proc),
-                                                  buf, this);
+                  if (p->gnutls_p)
+                    written = emacs_gnutls_write (p, buf, this);
                   else
 #endif
                     written = emacs_write (outfd, buf, this);