[Emacs-diffs] /srv/bzr/emacs/trunk r102648: * net/gnutls.el (gnutls-negotiate): Fix setting of default trustfiles.

[Romain Francoise]

------------------------------------------------------------
revno: 102648
committer: Romain Francoise <address@hidden>
branch nick: trunk
timestamp: Mon 2010-12-13 23:20:32 +0100
message:
  * net/gnutls.el (gnutls-negotiate): Fix setting of default trustfiles.
modified:
  lisp/ChangeLog
  lisp/net/gnutls.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-12-13 15:27:36 +0000
+++ b/lisp/ChangeLog    2010-12-13 22:20:32 +0000
@@ -1,3 +1,7 @@
+2010-12-13  Romain Francoise  <address@hidden>
+
+       * net/gnutls.el (gnutls-negotiate): Fix setting of default trustfiles.
+
 2010-12-13  Eli Zaretskii  <address@hidden>
 
        * subr.el (posn-col-row): Evaluate header-line-format in the

=== modified file 'lisp/net/gnutls.el'
--- a/lisp/net/gnutls.el        2010-11-01 05:53:15 +0000
+++ b/lisp/net/gnutls.el        2010-12-13 22:20:32 +0000
@@ -77,7 +77,7 @@
 TRUSTFILES is a list of CA bundles.
 KEYFILES is a list of client keys."
   (let* ((type (or type 'gnutls-x509pki))
-         (trusfiles (or trustfiles
+         (trustfiles (or trustfiles
                         '("/etc/ssl/certs/ca-certificates.crt")))
          (priority-string (or priority-string
                               (cond