[Emacs-diffs] /srv/bzr/emacs/emacs-24 r108013: src/gnutls.c (init_gnutls_functions): Fix bug#11311.

[Juanma Barranquero]

------------------------------------------------------------
revno: 108013
fixes bug: http://debbugs.gnu.org/11311
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Tue 2012-04-24 01:15:08 +0200
message:
  src/gnutls.c (init_gnutls_functions): Fix bug#11311.
  The value of :loaded-from is now a cons.
modified:
  src/ChangeLog
  src/gnutls.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-04-23 22:46:35 +0000
+++ b/src/ChangeLog     2012-04-23 23:15:08 +0000
@@ -1,3 +1,8 @@
+2012-04-23  Juanma Barranquero  <address@hidden>
+
+       * gnutls.c (init_gnutls_functions): The value of :loaded-from is
+       now a cons (bug#11311).
+
 2012-04-23  Paul Eggert  <address@hidden>
 
        Do not create empty overlays with the evaporate property (Bug#9642).

=== modified file 'src/gnutls.c'
--- a/src/gnutls.c      2012-04-14 01:46:06 +0000
+++ b/src/gnutls.c      2012-04-23 23:15:08 +0000
@@ -201,7 +201,7 @@
   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 @@
         {
           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;
         }