Query the user for whether to store the credentials.

[gnus] / lisp / nnimap.el

diff --git a/lisp/nnimap.el b/lisp/nnimap.el
index 44d9bab..f3cb77f 100644 (file)
--- a/lisp/nnimap.el
+++ b/lisp/nnimap.el
@@ -62,6 +62,10 @@ Values are `ssl', `network', `starttls' or `shell'.")
 (defvoo nnimap-inbox nil
   "The mail box where incoming mail arrives and should be split out of.")
 
+(defvoo nnimap-split-methods nil
+  "How mail is split.
+Uses the same syntax as nnmail-split-methods")
+
 (defvoo nnimap-authenticator nil
   "How nnimap authenticate itself to the server.
 Possible choices are nil (use default methods) or `anonymous'.")
@@ -107,8 +111,6 @@ some servers.")
     (download "gnus-download")
     (forward "gnus-forward")))
 
-(defvar nnimap-split-methods nil)
-
 (defun nnimap-buffer ()
   (nnimap-find-process-buffer nntp-server-buffer))
 
@@ -269,42 +271,50 @@ some servers.")
   (with-current-buffer (nnimap-make-process-buffer buffer)
     (let* ((coding-system-for-read 'binary)
           (coding-system-for-write 'binary)
+          (port nil)
           (ports
            (cond
             ((eq nnimap-stream 'network)
              (open-network-stream
               "*nnimap*" (current-buffer) nnimap-address
-              (or nnimap-server-port
-                  (if (netrc-find-service-number "imap")
-                      "imap"
-                    "143")))
+              (setq port
+                    (or nnimap-server-port
+                        (if (netrc-find-service-number "imap")
+                            "imap"
+                          "143"))))
              '("143" "imap"))
             ((eq nnimap-stream 'shell)
              (nnimap-open-shell-stream
               "*nnimap*" (current-buffer) nnimap-address
-              (or nnimap-server-port "imap"))
+              (setq port (or nnimap-server-port "imap")))
              '("imap"))
             ((eq nnimap-stream 'starttls)
              (starttls-open-stream
               "*nnimap*" (current-buffer) nnimap-address
-              (or nnimap-server-port "imap"))
+              (setq port (or nnimap-server-port "imap")))
              '("imap"))
             ((eq nnimap-stream 'ssl)
              (open-tls-stream
               "*nnimap*" (current-buffer) nnimap-address
-              (or nnimap-server-port
-                  (if (netrc-find-service-number "imaps")
-                      "imaps"
-                    "993")))
+              (setq port
+                    (or nnimap-server-port
+                        (if (netrc-find-service-number "imaps")
+                            "imaps"
+                          "993"))))
              '("143" "993" "imap" "imaps"))))
           connection-result login-result credentials)
       (setf (nnimap-process nnimap-object)
            (get-buffer-process (current-buffer)))
-      (when (and (nnimap-process nnimap-object)
-                (memq (process-status (nnimap-process nnimap-object))
-                      '(open run)))
+      (if (not (and (nnimap-process nnimap-object)
+                   (memq (process-status (nnimap-process nnimap-object))
+                         '(open run))))
+         (nnheader-report 'nnimap "Unable to contact %s:%s via %s"
+                          nnimap-address port nnimap-stream)
        (gnus-set-process-query-on-exit-flag (nnimap-process nnimap-object) nil)
-       (when (setq connection-result (nnimap-wait-for-connection))
+       (if (not (setq connection-result (nnimap-wait-for-connection)))
+           (nnheader-report 'nnimap
+                            "%s" (buffer-substring
+                                  (point) (line-end-position)))
          (when (eq nnimap-stream 'starttls)
            (nnimap-command "STARTTLS")
            (starttls-negotiate (nnimap-process nnimap-object)))
@@ -1129,9 +1139,12 @@ some servers.")
     (goto-char (point-max))
     (while (and (setq openp (memq (process-status process)
                                  '(open run)))
-               (not (re-search-backward (format "^%d .*\n" sequence)
-                                        (max (point-min) (- (point) 500))
-                                        t)))
+               (not (re-search-backward
+                     (format "^%d .*\n" sequence)
+                     (if nnimap-streaming
+                         (max (point-min) (- (point) 500))
+                       (point-min))
+                     t)))
       (when messagep
        (message "Read %dKB" (/ (buffer-size) 1000)))
       (nnheader-accept-process-output process)