bug#37221: 27.0.50; gnus fails to open connection post-NSM update

[Robert Pluim <rpluim@gmail.com>]

>>>>> On Wed, 04 Sep 2019 10:04:11 -0500, Alex Branham <alex.branham@gmail.com> said:

    Alex> On Wed 04 Sep 2019 at 16:56, Robert Pluim <rpluim@gmail.com> wrote:
    >> Iʼve spotted one possible problem: nsm-query runs even when the
    >> connection is unencrypted, which ends up doing (insert nil), which
    >> aborts the connection. Does the following help? (Lars, why is nsm
    >> prompting for unencrypted connections?)
    >> 
    >> diff --git a/lisp/net/nsm.el b/lisp/net/nsm.el
    >> index 5e8381075b..7243ae8822 100644
    >> --- a/lisp/net/nsm.el
    >> +++ b/lisp/net/nsm.el
    >> @@ -788,7 +788,8 @@ nsm-check-plain-connection
    >> (defun nsm-query (host port status what problems message)
    >> ;; If there is no user to answer queries, then say `no' to everything.
    >> (if (or noninteractive
    >> -	  nsm-noninteractive)
    >> +	  nsm-noninteractive
    >> +          (not status))
    >> nil
    >> (let ((response
    >> (condition-case nil

    Alex> nsm-query gets skipped now but the process is still killed (same
    Alex> message, etc).

Oh right, because now nsm-save-host doesnʼt get called. This should
work instead of the previous patch (but is not the right
solution, I think). You should get prompted by nsm now.

diff --git a/lisp/net/nsm.el b/lisp/net/nsm.el
index 5e8381075b..8750c19267 100644
--- a/lisp/net/nsm.el
+++ b/lisp/net/nsm.el
@@ -823,7 +823,7 @@ nsm-query-user
       ;; First format the certificate and warnings.
       (with-current-buffer-window
        buffer nil nil
-       (insert (nsm-format-certificate status))
+       (when status (insert (nsm-format-certificate status)))
        (insert message)
        (goto-char (point-min))
        ;; Fill the first line of the message, which usually