Synch to Gnus 200311251206.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index dfa9f5f..6eff074 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2003-11-25  Jesper Harder  <harder@ifa.au.dk>
+
+       * gnus-art.el (article-hide-boring-headers): Don't hide Reply-To
+       unless its list of addresses is identical to From.
+
 2003-11-25  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * dgnushack.el (mapc): Add the compiler macro for Emacs 20.

diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index 1d35d1e..0f1b5e0 100644 (file)
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -1822,12 +1822,19 @@ always hide."
                  (gnus-article-hide-header "reply-to")
                (let ((from (message-fetch-field "from"))
                      (reply-to (message-fetch-field "reply-to")))
-                 (when (and
-                        from reply-to
-                        (ignore-errors
-                          (gnus-string-equal
-                           (nth 1 (mail-extract-address-components from))
-                           (nth 1 (mail-extract-address-components reply-to)))))
+                 (when
+                     (and
+                      from reply-to
+                      (ignore-errors
+                        (equal
+                         (sort (mapcar
+                                (lambda (x) (downcase (cadr x)))
+                                (mail-extract-address-components from t))
+                               'string<)
+                         (sort (mapcar
+                                (lambda (x) (downcase (cadr x)))
+                                (mail-extract-address-components reply-to t))
+                               'string<))))
                    (gnus-article-hide-header "reply-to")))))
             ((eq elem 'date)
              (let ((date (message-fetch-field "date")))

diff --git a/texi/ChangeLog b/texi/ChangeLog
index e9bf8cb..bda3130 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,7 @@
+2003-11-25  Jesper Harder  <harder@ifa.au.dk>
+
+       * gnus.texi (Hiding Headers): Update.
+
 2003-11-20  Teodor Zlatanov  <tzz@lifelogs.com>
 
        * gnus.texi (Debugging IMAP): minor corrections

diff --git a/texi/gnus.texi b/texi/gnus.texi
index 80eccc0..6f4bc4b 100644 (file)
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -10785,7 +10785,7 @@ variable, will be displayed in random order after all the headers listed in this
 You can hide further boring headers by setting
 @code{gnus-treat-hide-boring-headers} to @code{head}.  What this function
 does depends on the @code{gnus-boring-article-headers} variable.  It's a
-list, but this list doesn't actually contain header names.  Instead is
+list, but this list doesn't actually contain header names.  Instead it
 lists various @dfn{boring conditions} that Gnus can check and remove
 from sight.
 
@@ -10797,9 +10797,9 @@ Remove all empty headers.
 Remove the @code{Followup-To} header if it is identical to the
 @code{Newsgroups} header.
 @item reply-to
-Remove the @code{Reply-To} header if it lists the same address as the
-@code{From} header, or if the @code{broken-reply-to} group parameter is
-set.
+Remove the @code{Reply-To} header if it lists the same addresses as
+the @code{From} header, or if the @code{broken-reply-to} group
+parameter is set.
 @item newsgroups
 Remove the @code{Newsgroups} header if it only contains the current group
 name.