Synch to No Gnus 200407120632.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bc527ad..1cfbc35 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,4 +1,11 @@
 2004-07-12  Katsumi Yamaoka  <yamaoka@jpl.org>
+       From David Hedbor <dhedbor@real.com>.
+
+       * nnmail.el (nnmail-split-lowercase-expanded): New user option.
+       (nnmail-expand-newtext): Lowercase expanded entries if
+       nnmail-split-lowercase-expanded is non-nil.
+
+2004-07-12  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * rfc2047.el (rfc2047-encode-region): Treat backslash-quoted
        characters as non-special.

diff --git a/lisp/nnmail.el b/lisp/nnmail.el
index 1949e6e..58cbc4e 100644 (file)
--- a/lisp/nnmail.el
+++ b/lisp/nnmail.el
@@ -573,6 +573,13 @@ by anything."
   :group 'nnmail
   :type 'boolean)
 
+(defcustom nnmail-split-lowercase-expanded t
+  "Whether to lowercase expanded entries (i.e. \\N) when splitting mails.
+This avoids the creation of multiple groups when users send to an address
+using different case (i.e. mailing-list@domain vs Mailing-List@Domain)."
+  :group 'nnmail
+  :type 'boolean)
+
 ;;; Internal variables.
 
 (defvar nnmail-article-buffer " *nnmail incoming*"
@@ -1463,7 +1470,10 @@ See the documentation for the variable `nnmail-split-fancy' for details."
              (setq N 0)
            (setq N (- c ?0)))
          (when (match-beginning N)
-           (push (buffer-substring (match-beginning N) (match-end N))
+           (push (if nnmail-split-lowercase-expanded
+                     (downcase (buffer-substring (match-beginning N)
+                                                 (match-end N)))
+                   (buffer-substring (match-beginning N) (match-end N)))
                  expanded))))
       (setq pos (1+ pos)))
     (if did-expand

diff --git a/texi/ChangeLog b/texi/ChangeLog
index 2c3fa0d..20c97c8 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,8 @@
+2004-07-12  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * gnus.texi (Splitting Mail): Add nnmail-split-lowercase-expanded.
+       (Fancy Mail Splitting): Ditto.
+
 2004-07-02  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * emacs-mime.texi (Encoding Customization): Addition.

diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi
index 03ed427..31e0550 100644 (file)
--- a/texi/gnus-ja.texi
+++ b/texi/gnus-ja.texi
@@ -12554,6 +12554,11 @@ Gnus \e$B$r;H$C$F?7$7$$%a!<%k$rFI$`;v$OHs>o$K4JC1$G$9!#$"$J$?$N%a!<%k%P%C%/\e(B
 ("list.\\1" "From:.* \\(.*\\)-list@@majordomo.com")
 @end lisp
 
+@noindent
+\e$B$3$N>l9g!"A^F~$5$l$k%F%-%9%H$r>.J8;z$K$9$Y$-$+$I$&$+\e(B
+\e$B$r\e(B @code{nnmail-split-lowercase-expanded} \e$B$,@)8f$7$^$9!#\e(B@xref{Fancy Mail
+Splitting}.
+
 \e$BFsHVL\$NMWAG$O4X?t$G$"$k;v$b$G$-$^$9!#$=$N>l9g$O!"$=$l$OK!B'$N:G=i$NMWAG\e(B
 \e$B$r0z?t$H$7$F!"%X%C%@!<$KHO0O$r69$a$F\e(B (narrowed to headers) \e$B8F$P$l$^$9!#\e(B
 \e$B$=$l$O!"%a!<%k$,$=$N%0%k!<%W$KB0$9$k$H9M$($k$N$G$"$l$P!"\e(B@code{nil} \e$B$G$J\e(B
@@ -13423,6 +13428,14 @@ table) \e$B$K=>$C$F40A4$K9gCW$7$J$1$l$P$J$j$^$;$s!#@55,I=8=$G%U%#!<%k%IL>$+\e(B
 \e$B;H$o$l$^$9!#F1MM$K!"MWAG\e(B @samp{\\1} \e$B$+$i\e(B @samp{\\9} \e$B$^$G$O%0%k!<%WIU\e(B
 \e$B$1\e(B 1 \e$B$+$i\e(B 9 \e$B$^$G$G9gCW$7$?J8;zNs$GBeBX$5$l$^$9!#\e(B
 
+@vindex nnmail-split-lowercase-expanded
+\e$B$3$3$G!"9gCW$7$?J8;zNs$r>.J8;z$K$7$?$b$N$GBeBX$9$k$Y$-$+$I$&$+\e(B
+\e$B$r\e(B @code{nnmail-split-lowercase-expanded} \e$B$,@)8f$7$^$9!#$3$l$r\e(B
+\e$BHs\e(B-@code{nil} \e$B$K$9$k$3$H$K$h$C$F!"%"%I%l%9$KBgJ8;z$H>.J8;z$,6hJL$;$:$K;H\e(B
+\e$B$o$l$F$$$k\e(B (\e$BNc$($P\e(B mailing-list@@domain \e$B$H\e(B Mailing-List@@Domain) \e$B>l9g$G\e(B
+\e$B$b!"J#?t$N%0%k!<%W$,@8@.$5$l$F$7$^$&$3$H$rHr$1$k$3$H$,$G$-$^$9!#%G%#%U%)\e(B
+\e$B%k%H$O\e(B @code{t} \e$B$G$9!#\e(B
+
 @vindex nnmail-split-fancy-match-partial-words
 @code{nnmail-split-fancy-match-partial-words} \e$B$O!"FC5iJ,3d$GItJ,E*$J8l$,\e(B
 \e$B9gCW$9$k$+$I$&$+$r@)8f$7$^$9!#\e(B

diff --git a/texi/gnus.texi b/texi/gnus.texi
index fa39cfe..f6eae05 100644 (file)
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -13307,6 +13307,10 @@ insert sub-expressions from the matched text.  For instance:
 ("list.\\1" "From:.* \\(.*\\)-list@@majordomo.com")
 @end lisp
 
+@noindent
+In that case, @code{nnmail-split-lowercase-expanded} controls whether
+the inserted text should be made lowercase.  @xref{Fancy Mail Splitting}.
+
 The second element can also be a function.  In that case, it will be
 called narrowed to the headers with the first element of the rule as the
 argument.  It should return a non-@code{nil} value if it thinks that the
@@ -14204,6 +14208,14 @@ matched string will be substituted.  Similarly, the elements @samp{\\1}
 up to @samp{\\9} will be substituted with the text matched by the
 groupings 1 through 9.
 
+@vindex nnmail-split-lowercase-expanded
+Where @code{nnmail-split-lowercase-expanded} controls whether the
+lowercase of the matched string should be used for the substitution.
+Setting it as non-@code{nil} is useful to avoid the creation of multiple
+groups when users send to an address using different case
+(i.e. mailing-list@@domain vs Mailing-List@@Domain).  The default value
+is @code{t}.
+
 @vindex nnmail-split-fancy-match-partial-words
 @code{nnmail-split-fancy-match-partial-words} controls whether partial
 words are matched during fancy splitting.