Synch with Oort Gnus.

diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index f894e17..b31b39b 100644 (file)
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,3 +1,7 @@
+2002-05-20  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * gnus-mdrtn.el (gnus-moderated-groups): Removed (require 'gnus-load).
+
 2002-04-24  Kai Gro\e,A_\e(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
 
        * ucs-tables.el (featurep): Barf on XEmacs.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 984cb59..565e8f3 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,17 @@
+2002-05-20  Jason  <jbaker@cs.utah.edu>
+
+       * gnus-art.el (gnus-request-article-this-buffer): Try
+       reconnecting if you don't get the message.
+
+2002-05-20  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * gnus-sum.el (gnus-summary-enter-digest-group): Only get
+       Reply-To headers from the headers.
+
+2002-05-18  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * mm-url.el (mm-url-insert): Remove junk message.
+
 2002-05-17  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * nnslashdot.el (nnslashdot-request-list): Parse new html.

diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index e0e2c86..94849bb 100644 (file)
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -5408,6 +5408,8 @@ If given a prefix, show the hidden text instead."
            (let ((gnus-override-method gnus-override-method)
                  (methods (and (stringp article)
                                gnus-refer-article-method))
+                 (backend (car (gnus-find-method-for-group
+                                gnus-newsgroup-name)))
                  result
                  (buffer-read-only nil))
              (if (or (not (listp methods))
@@ -5426,7 +5428,8 @@ If given a prefix, show the hidden text instead."
                (gnus-kill-all-overlays)
                (let ((gnus-newsgroup-name group))
                  (gnus-check-group-server))
-               (when (gnus-request-article article group (current-buffer))
+               (cond
+                ((gnus-request-article article group (current-buffer))
                  (when (numberp article)
                    (gnus-async-prefetch-next group article
                                              gnus-summary-buffer)
@@ -5434,10 +5437,13 @@ If given a prefix, show the hidden text instead."
                      (gnus-backlog-enter-article
                       group article (current-buffer))))
                  (setq result 'article))
-               (if (not result)
-                   (if methods
-                       (setq gnus-override-method (pop methods))
-                     (setq result 'done))))
+                (methods
+                 (setq gnus-override-method (pop methods)))
+                ((not (string-match "^400 "
+                                    (nnheader-get-report backend)))
+                 ;; If we get 400 server disconnect, reconnect and
+                 ;; retry; otherwise, assume the article has expired.
+                 (setq result 'done))))
              (and (eq result 'article) 'article)))
           ;; It was a pseudo.
           (t article)))

diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index 127c120..d9b01f3 100644 (file)
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -7843,8 +7843,8 @@ to guess what the document format is."
        (set-buffer gnus-original-article-buffer)
        ;; Have the digest group inherit the main mail address of
        ;; the parent article.
-       (when (setq to-address (or (message-fetch-field "reply-to")
-                                  (message-fetch-field "from")))
+       (when (setq to-address (or (gnus-fetch-field "reply-to")
+                                  (gnus-fetch-field "from")))
          (setq params (append
                        (list (cons 'to-address
                                    (funcall gnus-decode-encoded-word-function

diff --git a/lisp/mm-url.el b/lisp/mm-url.el
index 919cdb1..f1c032c 100644 (file)
--- a/lisp/mm-url.el
+++ b/lisp/mm-url.el
@@ -310,7 +310,6 @@ If FOLLOW-REFRESH is non-nil, redirect refresh url in META."
        (done nil)
        (first t)
        result)
-    (message "%s" url)
     (while (and (not (zerop (decf times)))
                (not done))
       (with-timeout (mm-url-timeout)

diff --git a/texi/Makefile.in b/texi/Makefile.in
index 6d06e4e..06b8989 100644 (file)
--- a/texi/Makefile.in
+++ b/texi/Makefile.in
@@ -121,7 +121,7 @@ clean:
        *.tmplatexi *.toc *.tp *.vr gnus.*.bak gnus.[cgk]ind gnus.idx   \
        gnus.ilg gnus.ind gnus.latexi*~* gnus.out gnus.tmplatexi1       \
        gnustmp.texi picons.tex smiley.tex texput.log thumb*.png        \
-       thumbdta.tex xface.tex
+       thumbdta.tex xface.tex *.tpt gnus-manual-*.pdf gnus-manual-*.ps.gz
 
 makeinfo:
        makeinfo -o gnus gnus.texi
@@ -204,12 +204,8 @@ psout: latexboth out
 latexboth: gnus-manual-a4.ps.gz gnus-manual-standard.ps.gz
 
 out:
-       cp gnus-manual-standard.ps.gz \
-       gnus-manual-a4.ps.gz \
-       /local/ftp/pub/emacs/gnus/manual
-       mv gnus-manual-standard.ps.gz \
-       gnus-manual-a4.ps.gz \
-       /hom/larsi/www_docs/www.gnus.org/documents
+       scp gnus-manual-*.ps.gz gnus-manual-*.pdf 
+       www@quimby:html/gnus/documents
 
 veryclean: clean
        rm -f gnus.dvi gnus.ps texi2latex.elc