Synch to No Gnus 200502250204.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9923dab..314255b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -50,6 +50,11 @@
        * nnrss.el (nnrss-verbose): New variable.
        (nnrss-request-group): Make it say nnrss is requesting a group.
 
+2005-02-21  Reiner Steib  <Reiner.Steib@gmx.de>
+
+       * gnus-art.el (gnus-parse-news-url, gnus-button-handle-news):
+       Handle news URL with given port correctly.
+
 2005-02-19  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * gnus-msg.el (gnus-copy-article-buffer): Quote decoded words
@@ -545,7 +550,7 @@
 
        * gnus-start.el (gnus-setup-news): Honor user's setting to
        gnus-message-archive-method.  Suggested by Lute Kamstra
-       <Lute.Kamstra@xs4all.nl>.
+       <lute@gnu.org>.
 
 2004-12-10  Arnaud Giersch  <arnaud.giersch@free.fr>  (tiny change)
 

diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index 3140bd9..74e5b90 100644 (file)
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -7149,15 +7149,18 @@ specified by `gnus-button-alist'."
                      (cons fun args)))))))
 
 (defun gnus-parse-news-url (url)
-  (let (scheme server group message-id articles)
+  (let (scheme server port group message-id articles)
     (with-temp-buffer
       (insert url)
       (goto-char (point-min))
       (when (looking-at "\\([A-Za-z]+\\):")
        (setq scheme (match-string 1))
        (goto-char (match-end 0)))
-      (when (looking-at "//\\([^/]+\\)/")
+      (when (looking-at "//\\([^:/]+\\)\\(:?\\)\\([0-9]+\\)?/")
        (setq server (match-string 1))
+       (setq port (if (stringp (match-string 3))
+                      (string-to-number (match-string 3))
+                    (match-string 3)))
        (goto-char (match-end 0)))
 
       (cond
@@ -7170,18 +7173,23 @@ specified by `gnus-button-alist'."
        (setq group (match-string 1)))
        (t
        (error "Unknown news URL syntax"))))
-    (list scheme server group message-id articles)))
+    (list scheme server port group message-id articles)))
 
 (defun gnus-button-handle-news (url)
   "Fetch a news URL."
-  (destructuring-bind (scheme server group message-id articles)
+  (destructuring-bind (scheme server port group message-id articles)
       (gnus-parse-news-url url)
     (cond
      (message-id
       (save-excursion
        (set-buffer gnus-summary-buffer)
        (if server
-           (let ((gnus-refer-article-method (list (list 'nntp server))))
+           (let ((gnus-refer-article-method
+                  (nconc (list (list 'nntp server))
+                         gnus-refer-article-method))
+                 (nntp-port-number (or port "nntp")))
+             (gnus-message 7 "Fetching %s with %s"
+                           message-id gnus-refer-article-method)
              (gnus-summary-refer-article message-id))
          (gnus-summary-refer-article message-id))))
      (group