Synch with Oort Gnus.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4aa25d6..5c69821 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2001-12-13  Josh Huber  <huber@alum.wpi.edu>
+
+       * gnus-cus.el (gnus-extra-topic-parameters): added topic parameter
+       subscribe-level
+       * gnus-topic.el (gnus-subscribe-topics): use it.
+
 2001-12-13 22:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * gnus-msg.el (gnus-summary-mail-forward): Forward all marked

diff --git a/lisp/gnus-cus.el b/lisp/gnus-cus.el
index f58e369..6df3ffa 100644 (file)
--- a/lisp/gnus-cus.el
+++ b/lisp/gnus-cus.el
@@ -242,7 +242,12 @@ DOC is a documentation string for the parameter.")
 If `gnus-subscribe-newsgroup-method' or
 `gnus-subscribe-options-newsgroup-method' is set to
 `gnus-subscribe-topics', new groups that matches this regexp will
-automatically be subscribed to this topic"))
+automatically be subscribed to this topic")
+    (subscribe-level (integer :tag "Subscribe Level" :value 1) "\
+If this topic parameter is set, when new groups are subscribed
+automatically under this topic (via the `subscribe' topic parameter)
+assign this level to the group, rather than the default level
+set in `gnus-level-default-subscribed'"))
   "Alist of topic parameters that are not also group parameters.
 
 Each entry has the form (NAME TYPE DOC), where NAME is the parameter

diff --git a/lisp/gnus-topic.el b/lisp/gnus-topic.el
index ccd9b42..99958a8 100644 (file)
--- a/lisp/gnus-topic.el
+++ b/lisp/gnus-topic.el
@@ -1691,6 +1691,12 @@ If REVERSE, reverse the sorting order."
          (gnus-subscribe-alphabetically newsgroup)
          ;; Add the group to the topic.
          (nconc (assoc topic gnus-topic-alist) (list newsgroup))
+         ;; if this topic specifies a default level, use it
+         (let ((subscribe-level (cdr (assq 'subscribe-level
+                                           (gnus-topic-parameters topic)))))
+           (when subscribe-level
+               (gnus-group-change-level newsgroup subscribe-level
+                                        gnus-level-default-subscribed)))
          (throw 'end t)))
       nil)))
 

diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi
index 65b33d4..330a1ab 100644 (file)
--- a/texi/gnus-ja.texi
+++ b/texi/gnus-ja.texi
@@ -3839,9 +3839,15 @@ Gnus
 @table @code
 @item subscribe
 \e$B%H%T%C%/$G?7$7$$%0%k!<%W$r9XFI$7$F$$$k>l\e(B
-\e$B9g\e(B (@pxref{Subscription Methods}), @code{subscribe} \e$B%H%T%C%/%Q%i%a!<%?$O\e(B
+\e$B9g\e(B (@pxref{Subscription Methods})\e$B!"\e(B@code{subscribe} \e$B%H%T%C%/%Q%i%a!<%?$O\e(B
 \e$B$I$N%0%k!<%W$,$I$N%H%T%C%/$K9T$/$+$r;XDj$7$^$9!#CM$O$=$N%H%T%C%/$K9T$/%0\e(B
 \e$B%k!<%W$K9gCW$9$k@55,I=8=$G$"$kI,MW$,$"$j$^$9!#\e(B
+
+@item subscribe-level
+\e$B%H%T%C%/$G?7$7$$%0%k!<%W$r9XFI$7$F$$$k>l\e(B
+\e$B9g\e(B (@code{subscribe} \e$B%Q%i%a!<%?$r;2>H\e(B)\e$B!"$=$N%0%k!<%W$N9XFIEY$N%l%Y%k\e(B
+\e$B$O\e(B @code{gnus-level-default-subscribed} \e$B$NBe$o$j\e(B
+\e$B$K\e(B @code{subscribe-level} \e$B%H%T%C%/%Q%i%a!<%?$NCM$K$J$j$^$9!#\e(B
 @end table
 
 \e$B%0%k!<%W%Q%i%a!<%?$O\e(B (\e$B$b$A$m$s\e(B) \e$B%H%T%C%/%Q%i%a!<%?$h$j$bM%@h$5$l!"I{%H%T%C\e(B

diff --git a/texi/gnus.texi b/texi/gnus.texi
index 9a7b003..27d5577 100644 (file)
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -3783,6 +3783,11 @@ When subscribing new groups by topic (@pxref{Subscription Methods}), the
 value should be a regexp to match the groups that should go in that
 topic.
 
+@item subscribe-level
+When subscribing new groups by topic (see the @code{subscribe} parameter),
+the group will be subscribed with the level specified in the 
+@code{subscribe-level} instead of @code{gnus-level-default-subscribed}.
+
 @end table
 
 Group parameters (of course) override topic parameters, and topic