sasl-ntlm.el, ntlm.el, md4.el: New files.

[gnus] / lisp / nnmail.el

diff --git a/lisp/nnmail.el b/lisp/nnmail.el
index c57f298..c5d9392 100644 (file)
--- a/lisp/nnmail.el
+++ b/lisp/nnmail.el
@@ -396,19 +396,20 @@ This is copy of the `lazy' widget in Emacs 21.4 provided for compatibility."
   :type '(menu-choice :value (any ".*value.*" "misc")
                       :tag "Type"
                       (string :tag "Destination")
-                      (list :tag "Or" :value (|)
+                      (list :tag "Use first match (|)" :value (|)
                             (const :format "" |)
                             (editable-list :inline t nnmail-split-fancy))
-                      (list :tag "And" :value (&)
+                      (list :tag "Use all matches (&)" :value (&)
                             (const :format "" &)
                             (editable-list :inline t nnmail-split-fancy))
-                      (list :tag "Function with fixed arguments"
-                            :value (:)
+                      (list :tag "Function with fixed arguments (:)"
+                            :value (: nil)
                             (const :format "" :value :)
                             function 
                             (editable-list :inline t (sexp :tag "Arg"))
                             )
-                      (list :tag "Function with split arguments" :value (!)
+                      (list :tag "Function with split arguments (!)"
+                            :value (! nil)
                             (const :format "" !)
                             function
                             (editable-list :inline t nnmail-split-fancy))
@@ -418,8 +419,13 @@ This is copy of the `lazy' widget in Emacs 21.4 provided for compatibility."
                             (choice :tag "Match"
                                     regexp 
                                     (symbol :value mail))
+                            (repeat :inline t
+                                    :tag "Restrictions"
+                                    (group :inline t
+                                           (const :format "" -)
+                                           regexp))
                             nnmail-split-fancy)
-                      (const :tag "Junk" junk)))
+                      (const :tag "Junk (delete mail)" junk)))
 
 (defcustom nnmail-split-fancy "mail.misc"
   "Incoming mail can be split according to this fancy variable.