From 59bf524c77cfc84b41b9b6085b08126495bc5d0e Mon Sep 17 00:00:00 2001 From: Ted Zlatanov Date: Tue, 25 Nov 2014 09:09:11 -0500 Subject: [PATCH] net/nsm.el: Use `gnutls-peer-status-warning-describe'. * net/nsm.el (nsm-check-tls-connection, nsm-save-host) (nsm-warnings-ok-p): Use `gnutls-peer-status-warning-describe'. --- lisp/ChangeLog | 5 +++++ lisp/net/nsm.el | 15 +++++++-------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d4f1dbd2177..81e28726209 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2014-11-25 Teodor Zlatanov + + * 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 * emacs-lisp/byte-run.el (function-put): Match argument names to diff --git a/lisp/net/nsm.el b/lisp/net/nsm.el index fdbcd13d3ee..35edd07fb6d 100644 --- a/lisp/net/nsm.el +++ b/lisp/net/nsm.el @@ -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 -- 2.39.5