mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-24 07:20:37 +00:00
Code Issues Releases Activity

net/nsm.el: Use `gnutls-peer-status-warning-describe'.

Browse Source 
* net/nsm.el (nsm-check-tls-connection, nsm-save-host)
(nsm-warnings-ok-p): Use `gnutls-peer-status-warning-describe'.
This commit is contained in:
Ted Zlatanov 2014-11-25 09:09:11 -05:00
parent 8608c1009d
commit 59bf524c77
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lisp/ChangeLog
View File

@ -1,3 +1,8 @@
2014-11-25 Teodor Zlatanov <tzz@lifelogs.com>
* net/nsm.el (nsm-check-tls-connection, nsm-save-host)
(nsm-warnings-ok-p): Use `gnutls-peer-status-warning-describe'.
2014-11-20 Nicolas Richard <theonewiththeevillook@yahoo.fr>
* emacs-lisp/byte-run.el (function-put): Match argument names to

15
lisp/net/nsm.el
View File

@ -169,7 +169,9 @@ unencrypted."
host port
(if (> (length warnings) 1)
"s" "")
(mapconcat 'cadr warnings "\n"))))
(mapconcat #'gnutls-peer-status-warning-describe
warnings
"\n"))))
(progn
(delete-process process)
nil)
@ -298,7 +300,7 @@ unencrypted."
(nconc saved `(:conditions (:unencrypted))))
((plist-get status :warnings)
(nconc saved
`(:conditions ,(mapcar 'car (plist-get status :warnings)))))))
`(:conditions ,(plist-get status :warnings))))))
(if (eq permanency 'always)
(progn
(nsm-remove-temporary-setting id)
@ -340,12 +342,9 @@ unencrypted."
result))
(defun nsm-warnings-ok-p (status settings)
(let ((not-ok nil)
(conditions (plist-get settings :conditions)))
(dolist (warning (plist-get status :warnings))
(when (memq (car warning) conditions)
(setq not-ok t)))
not-ok))
(null (cl-intersection
(plist-get settings :conditions)
(plist-get status :warnings))))
(defun nsm-remove-permanent-setting (id)
(setq nsm-permanent-host-settings