2000-10-11 John Wiegley <johnw@gnu.org>

	* gnus-topic.el (gnus-topic-mode): Use `setq' to clear
	`gnus-group-change-level-function', instead of `remove-hook',
	because it's not a hook!

	* gnus-mlspl.el (gnus-group-split-update): Check the value of
	`nnmail-crosspost', and use it to set the `no-crosspost'
	argument when calling `gnus-group-split-fancy'.  Otherwise, it
	assumes that cross-posting is always OK, no matter what
	`nmail-crosspost' is set to.
	(gnus-group-split-fancy): The argument order in the
	second-to-last `push' call was wrong, but since `no-crosspost'
	was always nil, it was never being triggered.

	* gnus-art.el (gnus-treat-hide-citation-maybe): Added this
	variable to correspond with `gnus-article-hide-citation-maybe'.
	(gnus-treatment-function-alist): Added entry for the above
	correlation.

diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index 7ddd89d..8e35782 100644 (file)
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -768,6 +768,13 @@ See the manual for details."
   :group 'gnus-article-treat
   :type gnus-article-treat-custom)
 
+(defcustom gnus-treat-hide-citation-maybe nil
+  "Hide cited text.
+Valid values are nil, t, `head', `last', an integer or a predicate.
+See the manual for details."
+  :group 'gnus-article-treat
+  :type gnus-article-treat-custom)
+
 (defcustom gnus-treat-strip-list-identifiers 'head
   "Strip list identifiers from `gnus-list-identifiers`.
 Valid values are nil, t, `head', `last', an integer or a predicate.
@@ -974,6 +981,7 @@ See the manual for details."
     (gnus-treat-hide-boring-headers gnus-article-hide-boring-headers)
     (gnus-treat-hide-signature gnus-article-hide-signature)
     (gnus-treat-hide-citation gnus-article-hide-citation)
+    (gnus-treat-hide-citation-maybe gnus-article-hide-citation-maybe)
     (gnus-treat-strip-list-identifiers gnus-article-hide-list-identifiers)
     (gnus-treat-strip-pgp gnus-article-hide-pgp)
     (gnus-treat-strip-pem gnus-article-hide-pem)

diff --git a/lisp/gnus-mlspl.el b/lisp/gnus-mlspl.el
index afeb41c..b7fcbd7 100644 (file)
--- a/lisp/gnus-mlspl.el
+++ b/lisp/gnus-mlspl.el
@@ -53,11 +53,12 @@ nnmail-pre-get-new-mail-hook."
 ;;;###autoload
 (defun gnus-group-split-update (&optional catch-all)
   "Computes nnmail-split-fancy from group params.
-It does this by calling \(gnus-group-split-fancy nil nil DEFAULTGROUP)."
+It does this by calling \(gnus-group-split-fancy nil CROSSPOST DEFAULTGROUP)."
   (interactive)
   (setq nnmail-split-fancy
        (gnus-group-split-fancy
-        nil nil (or catch-all gnus-group-split-default-catch-all-group)))
+        nil (null nnmail-crosspost)
+        (or catch-all gnus-group-split-default-catch-all-group)))
   (run-hooks 'gnus-group-split-updated-hook))
 
 ;;;###autoload
@@ -193,7 +194,7 @@ Calling (gnus-group-split-fancy nil nil \"mail.misc\") returns:
                    (setq catch-all nil)))))))))
     ;; Add catch-all if not crossposting
     (if (and catch-all no-crosspost)
-       (push split catch-all))
+       (push catch-all split))
     ;; Move it to the tail, while arranging that SPLITs appear in the
     ;; same order as groups.
     (setq split (reverse split))

diff --git a/lisp/gnus-topic.el b/lisp/gnus-topic.el
index 3532439..4b22a4d 100644 (file)
--- a/lisp/gnus-topic.el
+++ b/lisp/gnus-topic.el
@@ -1060,8 +1060,7 @@ articles in the topic and its subtopics."
     ;; Remove topic infestation.
     (unless gnus-topic-mode
       (remove-hook 'gnus-summary-exit-hook 'gnus-topic-update-topic)
-      (remove-hook 'gnus-group-change-level-function
-                  'gnus-topic-change-level)
+      (setq gnus-group-change-level-function nil)
       (remove-hook 'gnus-check-bogus-groups-hook 'gnus-topic-clean-alist)
       (setq gnus-group-prepare-function 'gnus-group-prepare-flat)
       (setq gnus-group-sort-alist-function 'gnus-group-sort-flat))