From: Paul Eggert Date: Tue, 5 Nov 2013 05:32:19 +0000 (-0800) Subject: Fix recent gnutls changes. X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~972 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=693698093480628b7438ca0fd1614b00acfd1137;p=emacs.git Fix recent gnutls changes. * gnutls.c (Fgnutls_boot): Don't assume C99. * process.c (wait_reading_process_output): Fix typo in recent change. --- diff --git a/src/ChangeLog b/src/ChangeLog index d0bdc6bee94..bd5688d868f 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2013-11-05 Paul Eggert + + Fix recent gnutls changes. + * gnutls.c (Fgnutls_boot): Don't assume C99. + * process.c (wait_reading_process_output): Fix typo in recent change. + 2013-11-05 Teodor Zlatanov * process.c (wait_reading_process_output, read_process_output) diff --git a/src/gnutls.c b/src/gnutls.c index 5241c91f9cb..82b2fc8baa4 100644 --- a/src/gnutls.c +++ b/src/gnutls.c @@ -1103,7 +1103,7 @@ one trustfile (usually a CA bundle). */) fn_gnutls_x509_crt_deinit (gnutls_verify_cert); } - // Only set this flag if the whole initialization succeeded. + /* Set this flag only if the whole initialization succeeded. */ XPROCESS (proc)->gnutls_p = 1; return gnutls_make_error (ret); diff --git a/src/process.c b/src/process.c index ec4cda77e1c..c0c522a1403 100644 --- a/src/process.c +++ b/src/process.c @@ -4623,7 +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. */ - && p->gnutls_state + && wait_proc->gnutls_state /* Do we have pending data? */ && ((emacs_gnutls_record_check_pending (wait_proc->gnutls_state))