[Emacs-diffs] Changes to emacs/lisp/gnus/gnus-art.el

[Miles Bader]

Index: emacs/lisp/gnus/gnus-art.el
diff -c emacs/lisp/gnus/gnus-art.el:1.62 emacs/lisp/gnus/gnus-art.el:1.63
*** emacs/lisp/gnus/gnus-art.el:1.62    Wed Feb  9 15:50:39 2005
--- emacs/lisp/gnus/gnus-art.el Tue Feb 22 23:15:11 2005
***************
*** 6648,6662 ****
                      (cons fun args)))))))
  
  (defun gnus-parse-news-url (url)
!   (let (scheme server 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 "//\\([^/]+\\)/")
        (setq server (match-string 1))
        (goto-char (match-end 0)))
  
        (cond
--- 6648,6665 ----
                      (cons fun args)))))))
  
  (defun gnus-parse-news-url (url)
!   (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 "//\\([^:/]+\\)\\(:?\\)\\([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
***************
*** 6669,6686 ****
        (setq group (match-string 1)))
         (t
        (error "Unknown news URL syntax"))))
!     (list scheme server group message-id articles)))
  
  (defun gnus-button-handle-news (url)
    "Fetch a news URL."
!   (destructuring-bind (scheme server 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))))
              (gnus-summary-refer-article message-id))
          (gnus-summary-refer-article message-id))))
       (group
--- 6672,6690 ----
        (setq group (match-string 1)))
         (t
        (error "Unknown news URL syntax"))))
!     (list scheme server port group message-id articles)))
  
  (defun gnus-button-handle-news (url)
    "Fetch a news URL."
!   (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)))
!                 (nntp-port-number (or port "nntp")))
              (gnus-summary-refer-article message-id))
          (gnus-summary-refer-article message-id))))
       (group