martin/emacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

src/gnutls.c (init_gnutls_functions): Fix bug#11311.

Browse Source 
The value of :loaded-from is now a cons.
This commit is contained in:
Juanma Barranquero
2012-04-24 01:15:08 +02:00
parent 89a438bd86
commit 02fd101be2
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/ChangeLog
View File

@@ -1,3 +1,8 @@
2012-04-23 Juanma Barranquero <lekktu@gmail.com>
* gnutls.c (init_gnutls_functions): The value of :loaded-from is
now a cons (bug#11311).
2012-04-23 Paul Eggert <eggert@cs.ucla.edu>
Do not create empty overlays with the evaporate property (Bug#9642).

4
src/gnutls.c
View File

@@ -201,7 +201,7 @@ init_gnutls_functions (Lisp_Object libraries)
max_log_level = global_gnutls_log_level;
GNUTLS_LOG2 (1, max_log_level, "GnuTLS library loaded:",
SDATA (Fget (Qgnutls_dll, QCloaded_from)));
SDATA (XCAR (Fget (Qgnutls_dll, QCloaded_from))));
return 1;
}
@@ -419,7 +419,7 @@ emacs_gnutls_read (struct Lisp_Process *proc, char *buf, EMACS_INT nbyte)
{
proc->gnutls_handshakes_tried++;
emacs_gnutls_handshake (proc);
GNUTLS_LOG2i (5, log_level, "Retried handshake",
GNUTLS_LOG2i (5, log_level, "Retried handshake",
proc->gnutls_handshakes_tried);
return -1;
}