aboutsummaryrefslogtreecommitdiffstats
path: root/src/gnutls.c
diff options
context:
space:
mode:
authorJuanma Barranquero2012-04-24 01:15:08 +0200
committerJuanma Barranquero2012-04-24 01:15:08 +0200
commit02fd101be2379fabdc5c45bf9ebd890e7c4bc58f (patch)
treebd383266f7f0499e9e3bbd8ce9518c4af5cb6fe2 /src/gnutls.c
parent89a438bd861e9b80e8f80a23955624c74782921a (diff)
downloademacs-02fd101be2379fabdc5c45bf9ebd890e7c4bc58f.tar.gz
emacs-02fd101be2379fabdc5c45bf9ebd890e7c4bc58f.zip
src/gnutls.c (init_gnutls_functions): Fix bug#11311.
The value of :loaded-from is now a cons.
Diffstat (limited to 'src/gnutls.c')
-rw-r--r--src/gnutls.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gnutls.c b/src/gnutls.c
index 70eea3b0b89..09268aee397 100644
--- a/src/gnutls.c
+++ b/src/gnutls.c
@@ -201,7 +201,7 @@ init_gnutls_functions (Lisp_Object libraries)
201 max_log_level = global_gnutls_log_level; 201 max_log_level = global_gnutls_log_level;
202 202
203 GNUTLS_LOG2 (1, max_log_level, "GnuTLS library loaded:", 203 GNUTLS_LOG2 (1, max_log_level, "GnuTLS library loaded:",
204 SDATA (Fget (Qgnutls_dll, QCloaded_from))); 204 SDATA (XCAR (Fget (Qgnutls_dll, QCloaded_from))));
205 return 1; 205 return 1;
206} 206}
207 207
@@ -419,7 +419,7 @@ emacs_gnutls_read (struct Lisp_Process *proc, char *buf, EMACS_INT nbyte)
419 { 419 {
420 proc->gnutls_handshakes_tried++; 420 proc->gnutls_handshakes_tried++;
421 emacs_gnutls_handshake (proc); 421 emacs_gnutls_handshake (proc);
422 GNUTLS_LOG2i (5, log_level, "Retried handshake", 422 GNUTLS_LOG2i (5, log_level, "Retried handshake",
423 proc->gnutls_handshakes_tried); 423 proc->gnutls_handshakes_tried);
424 return -1; 424 return -1;
425 } 425 }