Reinstate the two-part async code again so that we can debug it properly.

[gnus] / lisp / nntp.el

diff --git a/lisp/nntp.el b/lisp/nntp.el
index cae0150..0fc3855 100644 (file)
--- a/lisp/nntp.el
+++ b/lisp/nntp.el
@@ -40,7 +40,7 @@
 
 (eval-when-compile (require 'cl))
 
-(autoload 'auth-source-user-or-password "auth-source")
+(autoload 'auth-source-search "auth-source")
 
 (defgroup nntp nil
   "NNTP access for Gnus."
@@ -781,7 +781,8 @@ command whose response triggered the error."
       ;; The first time this is run, this variable is `try'.  So we
       ;; try.
       (when (eq nntp-server-list-active-group 'try)
-       (nntp-try-list-active (gnus-group-real-name (gnus-info-group (car infos)))))
+       (nntp-try-list-active
+        (gnus-group-real-name (gnus-info-group (car infos)))))
       (with-current-buffer (nntp-find-connection-buffer nntp-server-buffer)
        (erase-buffer)
        (let ((nntp-inhibit-erase t)
@@ -800,7 +801,8 @@ command whose response triggered the error."
                   (car infos)))
          (received 0)
          (last-point 1))
-      (when buf
+      (when (and buf
+                count)
        (with-current-buffer buf
          (while (and (gnus-buffer-live-p buf)
                      (progn
@@ -812,10 +814,7 @@ command whose response triggered the error."
                        (< received count)))
            (nntp-accept-response))
          ;; We now have all the entries.  Remove CRs.
-         (goto-char (point-min))
-         (while (search-forward "\r" nil t)
-           (replace-match "" t t))
-
+         (nnheader-strip-cr)
          (if (not nntp-server-list-active-group)
              (progn
                (nntp-copy-to-buffer nntp-server-buffer
@@ -828,7 +827,9 @@ command whose response triggered the error."
              (delete-region (match-beginning 0)
                             (progn (forward-line 1) (point))))
            (nntp-copy-to-buffer nntp-server-buffer (point-min) (point-max))
-           (gnus-active-to-gnus-format method gnus-active-hashtb nil t)))))))
+           (with-current-buffer nntp-server-buffer
+             (gnus-active-to-gnus-format method gnus-active-hashtb
+                                         nil t))))))))
 
 (deffoo nntp-retrieve-groups (groups &optional server)
   "Retrieve group info on GROUPS."
@@ -1229,10 +1230,16 @@ If SEND-IF-FORCE, only send authinfo to the server if the
   (let* ((list (netrc-parse nntp-authinfo-file))
         (alist (netrc-machine list nntp-address "nntp"))
         (force (or (netrc-get alist "force") nntp-authinfo-force))
-        (auth-info
-         (auth-source-user-or-password '("login" "password") nntp-address "nntp"))
-        (auth-user (nth 0 auth-info))
-        (auth-passwd (nth 1 auth-info))
+         (auth-info
+          (nth 0 (auth-source-search :max 1
+                                     ;; TODO: allow the virtual server name too
+                                     :host nntp-address
+                                     :port '("119" "nntp"))))
+         (auth-user (plist-get auth-info :user))
+         (auth-passwd (plist-get auth-info :secret))
+         (auth-passwd (if (functionp auth-passwd)
+                          (funcall auth-passwd)
+                        auth-passwd))
         (user (or
                ;; this is preferred to netrc-*
                auth-user