[Emacs-diffs] nsm 02/02: (nsm-query): Also make asynch code say `no' to everything.

[Lars Ingebrigtsen]

branch: nsm
commit 43cf4ee4a9a33da512319f539954aa56befd78d1
Author: Lars Magne Ingebrigtsen <address@hidden>
Date:   Tue Nov 18 20:24:28 2014 +0100

    (nsm-query): Also make asynch code say `no' to everything.
---
 lisp/ChangeLog  |    1 +
 lisp/net/nsm.el |    3 ++-
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a3240a9..67f89fb 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -2,6 +2,7 @@
 
        * net/nsm.el (nsm-query): If running non-interactively, then say
        `no' to everything.
+       (nsm-query): Also make asynch code say `no' to everything.
 
        * mail/smtpmail.el (smtpmail-via-smtp): Warn unless encrypted if
        we're sending a password.
diff --git a/lisp/net/nsm.el b/lisp/net/nsm.el
index 83fa14b..3fa164c 100644
--- a/lisp/net/nsm.el
+++ b/lisp/net/nsm.el
@@ -167,7 +167,8 @@ unencrypted."
 
 (defun nsm-query (id status what message &rest args)
   ;; If there is no user to answer queries, then say `no' to everything.
-  (if noninteractive
+  (if (or noninteractive
+         running-asynch-code)
       nil
     (let ((response
           (condition-case nil