diff options
Diffstat (limited to 'src/process.c')
| -rw-r--r-- | src/process.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/process.c b/src/process.c index e4673d24a2a..bdf16b7dbd2 100644 --- a/src/process.c +++ b/src/process.c | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | /* Asynchronous subprocess control for GNU Emacs. | 1 | /* Asynchronous subprocess control for GNU Emacs. |
| 2 | 2 | ||
| 3 | Copyright (C) 1985-1988, 1993-1996, 1998-1999, 2001-2011 | 3 | Copyright (C) 1985-1988, 1993-1996, 1998-1999, 2001-2012 |
| 4 | Free Software Foundation, Inc. | 4 | Free Software Foundation, Inc. |
| 5 | 5 | ||
| 6 | This file is part of GNU Emacs. | 6 | This file is part of GNU Emacs. |
| @@ -5060,9 +5060,8 @@ read_process_output (Lisp_Object proc, register int channel) | |||
| 5060 | proc_buffered_char[channel] = -1; | 5060 | proc_buffered_char[channel] = -1; |
| 5061 | } | 5061 | } |
| 5062 | #ifdef HAVE_GNUTLS | 5062 | #ifdef HAVE_GNUTLS |
| 5063 | if (XPROCESS (proc)->gnutls_p) | 5063 | if (p->gnutls_p) |
| 5064 | nbytes = emacs_gnutls_read (XPROCESS (proc), | 5064 | nbytes = emacs_gnutls_read (p, chars + carryover + buffered, |
| 5065 | chars + carryover + buffered, | ||
| 5066 | readmax - buffered); | 5065 | readmax - buffered); |
| 5067 | else | 5066 | else |
| 5068 | #endif | 5067 | #endif |
| @@ -5527,9 +5526,8 @@ send_process (volatile Lisp_Object proc, const char *volatile buf, | |||
| 5527 | #endif | 5526 | #endif |
| 5528 | { | 5527 | { |
| 5529 | #ifdef HAVE_GNUTLS | 5528 | #ifdef HAVE_GNUTLS |
| 5530 | if (XPROCESS (proc)->gnutls_p) | 5529 | if (p->gnutls_p) |
| 5531 | written = emacs_gnutls_write (XPROCESS (proc), | 5530 | written = emacs_gnutls_write (p, buf, this); |
| 5532 | buf, this); | ||
| 5533 | else | 5531 | else |
| 5534 | #endif | 5532 | #endif |
| 5535 | written = emacs_write (outfd, buf, this); | 5533 | written = emacs_write (outfd, buf, this); |