diff options
| author | Lars Magne Ingebrigtsen | 2014-12-08 19:13:30 +0100 |
|---|---|---|
| committer | Lars Magne Ingebrigtsen | 2014-12-08 19:13:39 +0100 |
| commit | e63c720b728e627f86da825d42dc592186429cbc (patch) | |
| tree | 7a7b731476fe748e647e15456f2174e641559f05 | |
| parent | 2354db7f53c25cfdac1b9436bbc56a54f16253f0 (diff) | |
| download | emacs-e63c720b728e627f86da825d42dc592186429cbc.tar.gz emacs-e63c720b728e627f86da825d42dc592186429cbc.zip | |
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.
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/net/gnutls.el | 3 |
2 files changed, 9 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 03ba24a4d41..91d2bba2b52 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2014-12-08 Lars Magne Ingebrigtsen <larsi@gnus.org> | ||
| 2 | |||
| 3 | * net/gnutls.el (gnutls-negotiate): Ignore files found via | ||
| 4 | 'file-name-handler-alist' since the gnutls library can't use those | ||
| 5 | (bug#15866). | ||
| 6 | |||
| 1 | 2014-12-08 Dmitry Gutov <dgutov@yandex.ru> | 7 | 2014-12-08 Dmitry Gutov <dgutov@yandex.ru> |
| 2 | 8 | ||
| 3 | * vc/vc-hg.el (vc-hg-dir-status-files): Only include ignores files | 9 | * 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 cf8e6a48cb4..200d355f6fd 100644 --- a/lisp/net/gnutls.el +++ b/lisp/net/gnutls.el | |||
| @@ -189,6 +189,9 @@ here's a recent version of the list. | |||
| 189 | It must be omitted, a number, or nil; if omitted or nil it | 189 | It must be omitted, a number, or nil; if omitted or nil it |
| 190 | defaults to GNUTLS_VERIFY_ALLOW_X509_V1_CA_CRT." | 190 | defaults to GNUTLS_VERIFY_ALLOW_X509_V1_CA_CRT." |
| 191 | (let* ((type (or type 'gnutls-x509pki)) | 191 | (let* ((type (or type 'gnutls-x509pki)) |
| 192 | ;; The gnutls library doesn't understand files delivered via | ||
| 193 | ;; the special handlers, so ignore all files found via those. | ||
| 194 | (file-name-handler-alist nil) | ||
| 192 | (trustfiles (or trustfiles | 195 | (trustfiles (or trustfiles |
| 193 | (delq nil | 196 | (delq nil |
| 194 | (mapcar (lambda (f) (and f (file-exists-p f) f)) | 197 | (mapcar (lambda (f) (and f (file-exists-p f) f)) |