Synch with Oort Gnus.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 79b491f..1d538bc 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2001-09-05  Kai Gro\e,A_\e(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+
+       * nnmail.el (nnmail-split-fancy): Document `junk'.
+
 2001-09-04  Simon Josefsson  <jas@extundo.com>
 
        * imap.el (imap-search): Don't error if server is broken.

diff --git a/lisp/nnmail.el b/lisp/nnmail.el
index b57a426..7c927f6 100644 (file)
--- a/lisp/nnmail.el
+++ b/lisp/nnmail.el
@@ -345,6 +345,12 @@ GROUP: Mail will be stored in GROUP (a string).
   return value FUNCTION should be a split, which is then recursively
   processed.
 
+junk: Mail will be deleted.  Use with care!  Do not submerge in water!
+  Example:
+  (setq nnmail-split-fancy
+        '(| (\"Subject\" \"MAKE MONEY FAST\" junk)
+            ...other.rules.omitted...))
+
 FIELD must match a complete field name.  VALUE must match a complete
 word according to the `nnmail-split-fancy-syntax-table' syntax table.
 You can use \".*\" in the regexps to match partial field names or words.

diff --git a/texi/ChangeLog b/texi/ChangeLog
index 394ccb6..8e3227d 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,9 @@
+2001-09-04  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * gnus.texi (Optional Backend Functions): The default function to
+       make a date format is `message-make-date', which should produce a
+       time zone.
+
 2001-09-04  Kai Gro\e,A_\e(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
 
        * gnus.texi (Optional Backend Functions): More detail about the

diff --git a/texi/gnus.texi b/texi/gnus.texi
index 4771c77..cd817f7 100644 (file)
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -22123,7 +22123,7 @@ description-buffer = *description-line
 The result data from this function should be all groups that were
 created after @samp{date}, which is in normal human-readable date format
 (i.e., the date format used in mail and news headers, and returned by
-the function @code{current-time-string} by default).  The data should be
+the function @code{message-make-date} by default).  The data should be
 in the active buffer format.
 
 It is okay for this function to return `too many' groups; some backends