Fix previous version of nsm-warnings-ok-p

* net/nsm.el (nsm-format-certificate): Don't bug out on missing
elements.
(nsm-warnings-ok-p): The new version of this function always
returned nil when everything was OK.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bd2199131f3dc58813a3e38c2f1accfdfbec664e..7fb129134418fd0681e9058b77972cb37d3166d9 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -2,6 +2,8 @@
 
        * net/nsm.el (nsm-format-certificate): Don't bug out on missing
        elements.
+       (nsm-warnings-ok-p): The new version of this function always
+       returned nil when everything was OK.
 
 2014-11-25  Teodor Zlatanov  <tzz@lifelogs.com>
 

diff --git a/lisp/net/nsm.el b/lisp/net/nsm.el
index daf4bf5dc6437d9218aadbec59177c07a00d6fd5..c5e048a727257215a985028d82bf6e60da8c074a 100644 (file)
--- a/lisp/net/nsm.el
+++ b/lisp/net/nsm.el
@@ -342,9 +342,12 @@ unencrypted."
     result))
 
 (defun nsm-warnings-ok-p (status settings)
-  (null (cl-intersection
-         (plist-get settings :conditions)
-         (plist-get status :warnings))))
+  (let ((ok t)
+       (conditions (plist-get settings :conditions)))
+    (dolist (warning (plist-get status :warnings))
+      (unless (memq warning conditions)
+       (setq ok nil)))
+    ok))
 
 (defun nsm-remove-permanent-setting (id)
   (setq nsm-permanent-host-settings