Synch with Gnus.

diff --git a/ChangeLog b/ChangeLog
index 74b47c5..356d3de 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-10-12  Jesper Harder <jesper_harder@hotmail.com>
+
+       * make.bat: Makes it possible to generate the Info files on
+       windows again.
+
 2000-10-11  Katsumi Yamaoka <yamaoka@jpl.org>
 
        * Makefile.in (info-ja, xinfo-ja): No need to use `MAKEINFO=no'.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 417f5ff..4a6ac1f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,23 @@
+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.
+
 2000-10-12 08:26:30  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * mm-util.el (mm-with-unibyte-current-buffer): Revert to old.

diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index a1bc361..76289a5 100644 (file)
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -798,6 +798,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.
@@ -1020,6 +1027,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 0ea0967..7cb059f 100644 (file)
--- a/lisp/gnus-mlspl.el
+++ b/lisp/gnus-mlspl.el
@@ -55,11 +55,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
@@ -195,7 +196,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 a113d14..d26bfcc 100644 (file)
--- a/lisp/gnus-topic.el
+++ b/lisp/gnus-topic.el
@@ -1061,8 +1061,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))

diff --git a/make.bat b/make.bat
index cce7352..978cdd6 100755 (executable)
--- a/make.bat
+++ b/make.bat
@@ -40,10 +40,11 @@ attrib -r %1\lisp\gnus\*
 copy *.el* %1\lisp\gnus\r
 \r
 :info\r
+set EMACSINFOHACK="(while (re-search-forward \"@\\(end \\)?ifnottex\" nil t) (replace-match \"\"))"\r
 cd ..\texi\r
-call %1\bin\%emacs% -batch -q -no-site-file message.texi -f texinfo-every-node-update -f texinfo-format-buffer -f save-buffer\r
-call %1\bin\%emacs% -batch -q -no-site-file emacs-mime.texi -f texinfo-every-node-update -f texinfo-format-buffer -f save-buffer\r
-call %1\bin\%emacs% -batch -q -no-site-file gnus.texi -f texinfo-every-node-update -f texinfo-format-buffer -f save-buffer\r
+call %1\bin\%emacs% -batch -q -no-site-file message.texi -eval %EMACSINFOHACK% -f texinfo-every-node-update -f texinfo-format-buffer -f save-buffer\r
+call %1\bin\%emacs% -batch -q -no-site-file emacs-mime.texi -eval %EMACSINFOHACK% -f texinfo-every-node-update -f texinfo-format-buffer -f save-buffer\r
+call %1\bin\%emacs% -batch -q -no-site-file gnus.texi -eval %EMACSINFOHACK% -f texinfo-every-node-update -f texinfo-format-buffer -f save-buffer\r
 if not "%2" == "copy" goto done\r
 copy gnus %1\info\r
 copy gnus-?? %1\info\r