diff options
| author | Paul Eggert <[email protected]> | 2012-04-09 12:51:06 -0700 |
|---|---|---|
| committer | Paul Eggert <[email protected]> | 2012-04-09 12:51:06 -0700 |
| commit | 9f46df23a3d01f82a24f2a3dd8730f0263fa9fde (patch) | |
| tree | e10467a42658a374d5cdb7bb25fc94016abdad7a /src/process.c | |
| parent | b8df54ffbefc5ddf40ddcda68a2a682769c5833d (diff) | |
| parent | a130c2afed5e7d5ec10efa1a57f4de2461a9c778 (diff) | |
Merge from trunk; add Bug#.
Diffstat (limited to 'src/process.c')
| -rw-r--r-- | src/process.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/process.c b/src/process.c index f14de474ee..2609a9cc25 100644 --- a/src/process.c +++ b/src/process.c @@ -647,7 +647,10 @@ make_process (Lisp_Object name) #ifdef HAVE_GNUTLS p->gnutls_initstage = GNUTLS_STAGE_EMPTY; + /* Default log level. */ p->gnutls_log_level = 0; + /* GnuTLS handshakes attempted for this connection. */ + p->gnutls_handshakes_tried = 0; p->gnutls_p = 0; p->gnutls_state = NULL; p->gnutls_x509_cred = NULL; @@ -7460,7 +7463,7 @@ syms_of_process (void) DEFSYM (Qargs, "args"); DEFVAR_BOOL ("delete-exited-processes", delete_exited_processes, - doc: /* *Non-nil means delete processes immediately when they exit. + doc: /* Non-nil means delete processes immediately when they exit. A value of nil means don't delete them until `list-processes' is run. */); delete_exited_processes = 1; |