[Emacs-diffs] /srv/bzr/emacs/trunk r107401: nntp.el (nntp-send-authinfo): Work for secure nntp entry in authinfo.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 107401
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Thu 2012-02-23 23:11:13 +0000
message:
  nntp.el (nntp-send-authinfo): Work for secure nntp entry in authinfo.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/nntp.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2012-02-23 01:31:39 +0000
+++ b/lisp/gnus/ChangeLog       2012-02-23 23:11:13 +0000
@@ -1,3 +1,7 @@
+2012-02-23  Katsumi Yamaoka  <address@hidden>
+
+       * nntp.el (nntp-send-authinfo): Work for secure nntp entry in authinfo.
+
 2012-02-20  Lars Ingebrigtsen  <address@hidden>
 
        * mm-decode.el (mm-shr): Remove "soft hyphens".

=== modified file 'lisp/gnus/nntp.el'
--- a/lisp/gnus/nntp.el 2012-02-01 23:16:56 +0000
+++ b/lisp/gnus/nntp.el 2012-02-23 23:11:13 +0000
@@ -1252,10 +1252,13 @@
   (let* ((list (netrc-parse nntp-authinfo-file))
         (alist (netrc-machine list nntp-address "nntp"))
          (auth-info
-          (nth 0 (auth-source-search :max 1
-                                     :host (list nntp-address
-                                                 (nnoo-current-server 'nntp))
-                                     :port '("119" "nntp"))))
+          (nth 0 (auth-source-search
+                 :max 1
+                 :host (list nntp-address
+                             (nnoo-current-server 'nntp))
+                 :port (or (cdr (assoc (format "%s" nntp-port-number)
+                                       '(("563" . ("563" "nntps" "snews")))))
+                           '("119" "nntp")))))
          (auth-user (plist-get auth-info :user))
          (auth-force (plist-get auth-info :force))
          (auth-passwd (plist-get auth-info :secret))