From: Juanma Barranquero <lekktu@gmail.com>
Date: Mon, 23 Apr 2012 23:15:08 +0000 (+0200)
Subject: src/gnutls.c (init_gnutls_functions): Fix bug#11311.
X-Git-Tag: emacs-24.2.90~471^2~294
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=02fd101be2379fabdc5c45bf9ebd890e7c4bc58f;p=emacs.git

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 8cb5202613e..73e54c21a60 100644
--- 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 70eea3b0b89..09268aee397 100644
--- 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;
         }