diff options
author | Miles Bader <miles@gnu.org> | 2004-09-20 12:03:05 +0000 |
---|---|---|
committer | Miles Bader <miles@gnu.org> | 2004-09-20 12:03:05 +0000 |
commit | a08b59c91f0e684c0f6306ebb044dacb3bcce3b7 (patch) | |
tree | 6d6f2149f67609f3ac64261305c52fb86d0294ac /lisp/gnus/nnmail.el | |
parent | 2d4a158aa239964d06f643fc37a944d91ddf49bb (diff) | |
download | emacs-a08b59c91f0e684c0f6306ebb044dacb3bcce3b7.tar.gz |
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-558
Merge from gnus--rel--5.10
Patches applied:
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-30
Update from CVS
Diffstat (limited to 'lisp/gnus/nnmail.el')
-rw-r--r-- | lisp/gnus/nnmail.el | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lisp/gnus/nnmail.el b/lisp/gnus/nnmail.el index bebf7ceaf07..c1a23d8ca9b 100644 --- a/lisp/gnus/nnmail.el +++ b/lisp/gnus/nnmail.el @@ -224,6 +224,7 @@ From header will be expired to the group \"nnfolder:Work\"; articles containing the sting \"IMPORTANT\" in the Subject header will be expired to the group \"nnfolder:IMPORTANT.YYYY.MMM\"; and everything else will be expired to \"nnfolder:Archive-YYYY\"." + :version "21.4" :group 'nnmail-expire :type '(repeat (list (choice :tag "Match against" (string :tag "Header") @@ -558,11 +559,13 @@ parameter. It should return nil, `warn' or `delete'." (defcustom nnmail-mail-splitting-charset nil "Default charset to be used when splitting incoming mail." + :version "21.4" :group 'nnmail :type 'symbol) (defcustom nnmail-mail-splitting-decodes nil "Whether the nnmail splitting functionality should MIME decode headers." + :version "21.4" :group 'nnmail :type 'boolean) |