Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-734

Merge from gnus--rel--5.10

Patches applied:

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

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-76
 - miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-77
   Update from CVS

2004-12-13  Katsumi Yamaoka  <yamaoka@jpl.org>

   * lisp/gnus/gnus-group.el (gnus-group-make-rss-group): Use
   gnus-group-make-group instead of gnus-group-unsubscribe-group.

   * lisp/gnus/gnus-start.el (gnus-setup-news): Honor user's setting to
   gnus-message-archive-method.  Suggested by Lute Kamstra
   <Lute.Kamstra@xs4all.nl>.

2004-12-08  Reiner Steib  <Reiner.Steib@gmx.de>

   * man/gnus-faq.texi ([5.1]): Added missing bracket.

   * man/gnus.texi (Filtering Spam Using The Spam ELisp Package): Index
   `spam-initialize'.

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 47945169a527dc1853ebf9fe96b2c42add9734ba..518a99030859e9c62b2e16bd008cb6aeed496b25 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -2,6 +2,15 @@
 
        * gnus-art.el (gnus-narrow-to-page): Don't hardcode point-min.
 
+2004-12-13  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * gnus-group.el (gnus-group-make-rss-group): Use
+       gnus-group-make-group instead of gnus-group-unsubscribe-group.
+
+       * gnus-start.el (gnus-setup-news): Honor user's setting to
+       gnus-message-archive-method.  Suggested by Lute Kamstra
+       <Lute.Kamstra@xs4all.nl>.
+
 2004-12-02  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * message.el (message-forward-make-body-mml): Remove headers

diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el
index c55264b22deb8f0baa9bfccfe3577259ab821b79..b7d0cf9eef451efa0fc252b135e056668627315d 100644 (file)
--- a/lisp/gnus/gnus-group.el
+++ b/lisp/gnus/gnus-group.el
@@ -2592,8 +2592,7 @@ If there is, use Gnus to create an nnrss group"
              (href (cdr (assoc 'href feedinfo))))
          (push (list title href desc)
                nnrss-group-alist)
-         (gnus-group-unsubscribe-group
-          (concat "nnrss:" title))
+         (gnus-group-make-group title '(nnrss ""))
          (nnrss-save-server-data nil))
       (error "No feeds found for %s" url))))
 

diff --git a/lisp/gnus/gnus-start.el b/lisp/gnus/gnus-start.el
index 17b0f1d687d58cc872520a4c32e0fd844a374010..e1985c5db5d0d369fa797ea3e0c64b3d632e4d6b 100644 (file)
--- a/lisp/gnus/gnus-start.el
+++ b/lisp/gnus/gnus-start.el
@@ -952,16 +952,28 @@ If LEVEL is non-nil, the news will be set up at level LEVEL."
     ;; Make sure the archive server is available to all and sundry.
     (when gnus-message-archive-method
       (unless (assoc "archive" gnus-server-alist)
-       (push `("archive"
-               nnfolder
-               "archive"
-               (nnfolder-directory
-                ,(nnheader-concat message-directory "archive"))
-               (nnfolder-active-file
-                ,(nnheader-concat message-directory "archive/active"))
-               (nnfolder-get-new-mail nil)
-               (nnfolder-inhibit-expiry t))
-             gnus-server-alist)))
+       (let ((method (or (and (stringp gnus-message-archive-method)
+                              (gnus-server-to-method
+                               gnus-message-archive-method))
+                         gnus-message-archive-method)))
+         ;; Check whether the archive method is writable.
+         (unless (or (stringp method)
+                     (memq 'respool (assoc (format "%s" (car method))
+                                           gnus-valid-select-methods)))
+           (setq method "archive")) ;; The default.
+         (push (if (stringp method)
+                   `("archive"
+                     nnfolder
+                     ,method
+                     (nnfolder-directory
+                      ,(nnheader-concat message-directory method))
+                     (nnfolder-active-file
+                      ,(nnheader-concat message-directory
+                                        (concat method "/active")))
+                     (nnfolder-get-new-mail nil)
+                     (nnfolder-inhibit-expiry t))
+                 (cons "archive" method))
+               gnus-server-alist))))
 
     ;; If we don't read the complete active file, we fill in the
     ;; hashtb here.

diff --git a/man/ChangeLog b/man/ChangeLog
index 2f1216bd71ba4c4df32975d83334dbef0cfd2b64..b251dc8e912a0daae1bbc253c888363702fce960 100644 (file)
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -150,6 +150,13 @@
        to Alex Ott, Karl Fogel, Stefan Monnier, and David Kastrup for
        suggestions.
 
+2004-12-08  Reiner Steib  <Reiner.Steib@gmx.de>
+
+       * gnus-faq.texi ([5.1]): Added missing bracket.
+
+       * gnus.texi (Filtering Spam Using The Spam ELisp Package): Index
+       `spam-initialize'.
+
 2004-11-22  Reiner Steib  <Reiner.Steib@gmx.de>
 
        * message.texi (Various Message Variables): Mention that all mail
@@ -157,11 +164,6 @@
 
        * gnus.texi (Splitting Mail): Clarify bogus group.
 
-2004-11-16  Reiner Steib  <Reiner.Steib@gmx.de>
-
-       * gnus.texi (Filtering Spam Using The Spam ELisp Package): Index
-       `spam-initialize'.
-
 2004-11-02  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * emacs-mime.texi (Encoding Customization): Fix

diff --git a/man/gnus-faq.texi b/man/gnus-faq.texi
index 5d243f8a02ea14fb8066af61b8702520f6acdbce..280280a401e64f44fb4c45ad94a6165030d7b470 100644 (file)
--- a/man/gnus-faq.texi
+++ b/man/gnus-faq.texi
@@ -1414,7 +1414,7 @@ Answer:
  message. For a follow up to a newsgroup, it's
  @samp{f} and @samp{F}
  (analog to @samp{r} and
- @samp{R}.
+ @samp{R}).
  
 
  Enter new headers above the line saying "--text follows