Mercurial > emacs

changeset 111951:027c7b917c8a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* net/gnutls.el (gnutls-negotiate): Fix setting of default trustfiles.
author Romain Francoise <romain@orebokech.com>
date Mon, 13 Dec 2010 23:20:32 +0100
parents 71a544852265
children db63bc492d85
files lisp/ChangeLog lisp/net/gnutls.el
diffstat 2 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Mon Dec 13 09:27:56 2010 -0800
+++ b/lisp/ChangeLog	Mon Dec 13 23:20:32 2010 +0100
@@ -1,3 +1,7 @@
+2010-12-13  Romain Francoise  <romain@orebokech.com>
+
+	* net/gnutls.el (gnutls-negotiate): Fix setting of default trustfiles.
+
 2010-12-13  Eli Zaretskii  <eliz@gnu.org>
 
 	* subr.el (posn-col-row): Evaluate header-line-format in the
--- a/lisp/net/gnutls.el	Mon Dec 13 09:27:56 2010 -0800
+++ b/lisp/net/gnutls.el	Mon Dec 13 23:20:32 2010 +0100
@@ -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