Accept the moronic openssl s_client -starttls output, too.

[gnus] / lisp / gnus-int.el

diff --git a/lisp/gnus-int.el b/lisp/gnus-int.el
index 2ca3205..33d020f 100644 (file)
--- a/lisp/gnus-int.el
+++ b/lisp/gnus-int.el
@@ -94,11 +94,10 @@ If CONFIRM is non-nil, the user will be asked for an NNTP server."
       (when confirm
        ;; Read server name with completion.
        (setq gnus-nntp-server
-             (completing-read "NNTP server: "
-                              (mapcar 'list
-                                      (cons (list gnus-nntp-server)
-                                            gnus-secondary-servers))
-                              nil nil gnus-nntp-server)))
+             (gnus-completing-read "NNTP server"
+                                    (cons gnus-nntp-server
+                                          gnus-secondary-servers)
+                                    nil gnus-nntp-server)))
 
       (when (and gnus-nntp-server
                 (stringp gnus-nntp-server)
@@ -181,10 +180,15 @@ If it is down, start it up (again)."
       (prog1
          (setq result (gnus-open-server method))
        (unless silent
-         (gnus-message 5 "Opening %s server%s...%s" (car method)
-                       (if (equal (nth 1 method) "") ""
-                         (format " on %s" (nth 1 method)))
-                       (if result "done" "failed")))))))
+         (gnus-message
+          (if result 5 3)
+          "Opening %s server%s...%s" (car method)
+          (if (equal (nth 1 method) "") ""
+            (format " on %s" (nth 1 method)))
+          (if result
+              "done"
+            (format "failed: %s"
+                    (nnheader-get-report-string (car method))))))))))
 
 (defun gnus-get-function (method function &optional noerror)
   "Return a function symbol based on METHOD and FUNCTION."
@@ -281,14 +285,7 @@ If it is down, start it up (again)."
                  ;; recurse to open the agent's backend.
                  (setq open-offline (eq gnus-server-unopen-status 'offline))
                  gnus-server-unopen-status)
-                ((and
-                  (not gnus-batch-mode)
-                  (gnus-y-or-n-p
-                   (format
-                    "Unable to open server %s (%s), go offline? "
-                    server
-                    (nnheader-get-report
-                     (car gnus-command-method)))))
+                ((not gnus-batch-mode)
                  (setq open-offline t)
                  'offline)
                 (t