From: yamaoka <yamaoka>
Date: Tue, 9 Dec 2003 21:55:35 +0000 (+0000)
Subject: Synch to Gnus 200312091840.
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3fb2e00d019c5bf26c51fbb0ea63270809222ec2;p=elisp%2Fgnus.git-

Synch to Gnus 200312091840.
---

diff --git a/lisp/nnmail.el b/lisp/nnmail.el
index 4901b3f..61b678d 100644
--- a/lisp/nnmail.el
+++ b/lisp/nnmail.el
@@ -395,19 +395,19 @@ 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"
+                      (list :tag "Function with fixed arguments (:)"
                             :value (:)
                             (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 (!)
                             (const :format "" !)
                             function
                             (editable-list :inline t nnmail-split-fancy))
@@ -418,7 +418,7 @@ This is copy of the `lazy' widget in Emacs 21.4 provided for compatibility."
                                     regexp 
                                     (symbol :value mail))
                             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.