From: Lars Magne Ingebrigtsen <larsi@gnus.org>
Date: Tue, 25 Nov 2014 15:30:36 +0000 (+0100)
Subject: Fix previous version of nsm-warnings-ok-p
X-Git-Tag: emacs-25.0.90~2635^2~327
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ee4eb2810c4d9e5f4964d99e9ea9d3838f41f3d1;p=emacs.git

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 bd2199131f3..7fb12913441 100644
--- 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 daf4bf5dc64..c5e048a7272 100644
--- 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