Revision: miles@gnu.org--gnu-2005/gnus--devo--0--patch-53

Merge from gnus--rel--5.10

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-111
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-113
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-114
   <no summary provided>

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-124
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-127
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-128
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-27
 - miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-30
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-31
   Merge from emacs--cvs-trunk--0

2005-02-21  Reiner Steib  <Reiner.Steib@gmx.de>

   * lisp/gnus-art.el (gnus-parse-news-url, gnus-button-handle-news):
   Handle news URL with given port correctly.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 270da6c..89dd820 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
@@ -59,8 +64,8 @@
 
        * mml.el (mime-to-mml): Ditto.
 
-       * rfc2047.el (rfc2047-encode-parameter): Use ietf-drums-tspecials.
-       (rfc2047-quote-decoded-words-containing-tspecials): New variable.
+       * rfc2047.el (rfc2047-quote-decoded-words-containing-tspecials):
+       New variable.
        (rfc2047-decode-region): Quote decoded words containing special
        characters when rfc2047-quote-decoded-words-containing-tspecials
        is non-nil.
@@ -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 8b5f8dc..8495f28 100644 (file)
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -6613,15 +6613,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
@@ -6634,18 +6637,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