[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master e63c720: Make gnutls-negotiate ignore specially han
From: |
Lars Ingebrigtsen |
Subject: |
[Emacs-diffs] master e63c720: Make gnutls-negotiate ignore specially handled files |
Date: |
Mon, 08 Dec 2014 18:13:44 +0000 |
branch: master
commit e63c720b728e627f86da825d42dc592186429cbc
Author: Lars Magne Ingebrigtsen <address@hidden>
Commit: Lars Magne Ingebrigtsen <address@hidden>
Make gnutls-negotiate ignore specially handled files
Fixes: debbugs:15866
* lisp/net/gnutls.el (gnutls-negotiate): Ignore files found via
'file-name-handler-alist' since the gnutls library can't use those.
---
lisp/ChangeLog | 6 ++++++
lisp/net/gnutls.el | 3 +++
2 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 03ba24a..91d2bba 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2014-12-08 Lars Magne Ingebrigtsen <address@hidden>
+
+ * net/gnutls.el (gnutls-negotiate): Ignore files found via
+ 'file-name-handler-alist' since the gnutls library can't use those
+ (bug#15866).
+
2014-12-08 Dmitry Gutov <address@hidden>
* vc/vc-hg.el (vc-hg-dir-status-files): Only include ignores files
diff --git a/lisp/net/gnutls.el b/lisp/net/gnutls.el
index cf8e6a4..200d355 100644
--- a/lisp/net/gnutls.el
+++ b/lisp/net/gnutls.el
@@ -189,6 +189,9 @@ here's a recent version of the list.
It must be omitted, a number, or nil; if omitted or nil it
defaults to GNUTLS_VERIFY_ALLOW_X509_V1_CA_CRT."
(let* ((type (or type 'gnutls-x509pki))
+ ;; The gnutls library doesn't understand files delivered via
+ ;; the special handlers, so ignore all files found via those.
+ (file-name-handler-alist nil)
(trustfiles (or trustfiles
(delq nil
(mapcar (lambda (f) (and f (file-exists-p f) f))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master e63c720: Make gnutls-negotiate ignore specially handled files,
Lars Ingebrigtsen <=