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

The value of :loaded-from is now a cons.

diff --git a/src/ChangeLog b/src/ChangeLog
index 8cb5202613ecac144e5f8a8e5411025dd0f60905..73e54c21a60aa46a7338fd92186f09d56e64fdfe 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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).

diff --git a/src/gnutls.c b/src/gnutls.c
index 70eea3b0b8925964ffede9896d666f4c7f450126..09268aee3978f3879c971ae27d368873cb90f1dc 100644 (file)
--- a/src/gnutls.c
+++ b/src/gnutls.c
@@ -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;
         }