Synch to No Gnus 200603271810.

diff --git a/ChangeLog b/ChangeLog
index e9a9fad..7941083 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-03-27  Reiner Steib  <Reiner.Steib@gmx.de>
+
+       * Makefile.in (release-revert-files): Replace
+       release-revert-changelog.
+       (release-diff): Remove garbage.
+
 2006-03-07  Reiner Steib  <Reiner.Steib@gmx.de>
 
        * etc/images/README: Add GIMP script.

diff --git a/Makefile.in b/Makefile.in
index b219303..722a1d0 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -292,9 +292,9 @@ release-bump-version:       release-check-settings
        fi
        cvs diff -U0 $(RELEASE_COMMIT_FILES); sleep 2
 
-release-revert-changelog:
-       rm -i      lisp/ChangeLog texi/ChangeLog
-       cvs update lisp/ChangeLog texi/ChangeLog
+release-revert-files:
+       rm -i      $(RELEASE_COMMIT_FILES)
+       cvs update $(RELEASE_COMMIT_FILES)
 
 release-commit:        release-check-settings
        @echo -e '\007'
@@ -335,7 +335,7 @@ README:
 # Make a diff between current and previous release.  Example:
 # ftp://quimby.gnus.org/pub/gnus/ding-patches/gnus-5.10.5-5.10.6.diff.gz
 release-diff:  release-check-settings
-       cvs diff -r $(OLD_TAG) -r $(TAG) > temp.diff || true
+       cvs diff -r $(OLD_TAG) -r $(TAG) | sed -e '/^\? /d' > temp.diff || true
        mv temp.diff gnus-`echo $(OLD_TAG)%$(TAG)|tr - .|tr -d v|tr % -`.diff
        gzip         gnus-`echo $(OLD_TAG)%$(TAG)|tr - .|tr -d v|tr % -`.diff
        ls -l        gnus-`echo $(OLD_TAG)%$(TAG)|tr - .|tr -d v|tr % -`.diff.gz

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 72d7b7b..252fa13 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,9 +1,21 @@
-2006-03-26  Andreas Seltenreich  <uwi7@rz.uni-karlsruhe.de>  (tiny change)
+2006-03-27  Reiner Steib  <Reiner.Steib@gmx.de>
+
+       * gnus-sum.el (gnus-summary-from-or-to-or-newsgroups): Don't use
+       XEmacs-only `replace-in-string'.  Use `gnus-group-real-name'
+       instead.
+
+2006-03-27  Karl Kleinpaste  <karl@charcoal.com>
+
+       * gnus-sum.el (gnus-summary-from-or-to-or-newsgroups): Improve
+       newsgroups handling for NNTP overviews which don't include
+       Newsgroups.
+
+2006-03-26  Andreas Seltenreich  <uwi7@rz.uni-karlsruhe.de>
 
        * message.el (message-resend): Bind message-generate-hashcash to
        to nil.
 
-2006-03-26  Andreas Seltenreich  <uwi7@rz.uni-karlsruhe.de>  (tiny change)
+2006-03-26  Andreas Seltenreich  <uwi7@rz.uni-karlsruhe.de>
 
        * hashcash.el (hashcash-already-paid-p): Bind case-fold-search
        when searching for already-paid recipients.

diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index e40a431..e57e404 100644 (file)
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -3505,7 +3505,13 @@ buffer that was in action when the last article was fetched."
                      (inline
                        (gnus-summary-extract-address-component
                         (funcall gnus-decode-encoded-word-function to)))))
-            ((setq newsgroups (cdr (assq 'Newsgroups extra-headers)))
+            ((setq newsgroups
+                   (or
+                    (cdr (assq 'Newsgroups extra-headers))
+                    (and
+                      (eq (car (gnus-find-method-for-group
+                                gnus-newsgroup-name)) 'nntp)
+                     (gnus-group-real-name gnus-newsgroup-name))))
              (concat gnus-summary-newsgroup-prefix newsgroups)))))
      (inline (gnus-summary-extract-address-component gnus-tmp-from)))))
 

diff --git a/texi/ChangeLog b/texi/ChangeLog
index 6c25d19..ddfa0b4 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,17 @@
+2006-03-27  Reiner Steib  <Reiner.Steib@gmx.de>
+
+       * sasl.texi: Use @copyright{} instead of (C).  Update copyright.
+
+2006-03-27  Karl Berry  <karl@gnu.org>
+
+       * gnus.texi, message.texi, emacs-mime.texi, sieve.texi, pgg.texi:
+       Do not indent copyright year list.
+
+2006-03-27  Reiner Steib  <Reiner.Steib@gmx.de>
+
+       * gnus-faq.texi: Use .invalid.
+       ([5.4]): Fix gnus-posting-styles example.
+
 2006-03-20  Romain Francoise  <romain@orebokech.com>
 
        * gnus.texi (Mail Folders, Mail Spool): Grammar fixes.

diff --git a/texi/emacs-mime.texi b/texi/emacs-mime.texi
index c99d1a0..21275fc 100644 (file)
--- a/texi/emacs-mime.texi
+++ b/texi/emacs-mime.texi
@@ -9,8 +9,8 @@
 @copying
 This file documents the Emacs MIME interface functionality.
 
-Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
-          Free Software Foundation, Inc.
+Copyright @copyright{} 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+2006 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document

diff --git a/texi/gnus-faq.texi b/texi/gnus-faq.texi
index 7bab196..2315375 100644 (file)
--- a/texi/gnus-faq.texi
+++ b/texi/gnus-faq.texi
@@ -233,10 +233,10 @@ Which version of Emacs do I need?
 
 @subsubheading Answer
 
-Gnus 5.10 requires an Emacs version that is greater
-than or equal to Emacs 20.7 or XEmacs 21.1. The
-development versions of Gnus (aka No Gnus) require Emacs
-21 or XEmacs 21.4.
+Gnus 5.10 requires an Emacs version that is greater than or equal
+to Emacs 20.7 or XEmacs 21.1.
+The development versions of Gnus (aka No Gnus) requires Emacs 21
+or XEmacs 21.4.
 
 @node [1.7]
 @subsubheading Question 1.7
@@ -1197,26 +1197,26 @@ from using them):
 @example
 (setq nnmail-split-methods
   '(("duplicates" "^Gnus-Warning:.*duplicate")
-    ("XEmacs-NT" "^\\(To:\\|CC:\\).*localpart@@xemacs.bla.*")
-    ("Gnus-Tut" "^\\(To:\\|CC:\\).*localpart@@socha.bla.*")
-    ("tcsh" "^\\(To:\\|CC:\\).*localpart@@mx.gw.bla.*")
-    ("BAfH" "^\\(To:\\|CC:\\).*localpart@@.*uni-muenchen.bla.*")
+    ("XEmacs-NT" "^\\(To:\\|CC:\\).*localpart@@xemacs.invalid.*")
+    ("Gnus-Tut" "^\\(To:\\|CC:\\).*localpart@@socha.invalid.*")
+    ("tcsh" "^\\(To:\\|CC:\\).*localpart@@mx.gw.invalid.*")
+    ("BAfH" "^\\(To:\\|CC:\\).*localpart@@.*uni-muenchen.invalid.*")
     ("Hamster-src" "^\\(CC:\\|To:\\).*hamster-sourcen@@yahoogroups.\\(de\\|com\\).*")
-    ("Tagesschau" "^From: tagesschau <localpart@@www.tagesschau.bla>$")
-    ("Replies" "^\\(CC:\\|To:\\).*localpart@@Frank-Schmitt.bla.*")
-    ("EK" "^From:.*\\(localpart@@privateprovider.bla\\|localpart@@workplace.bla\\).*")
+    ("Tagesschau" "^From: tagesschau <localpart@@www.tagesschau.invalid>$")
+    ("Replies" "^\\(CC:\\|To:\\).*localpart@@Frank-Schmitt.invalid.*")
+    ("EK" "^From:.*\\(localpart@@privateprovider.invalid\\|localpart@@workplace.invalid\\).*")
     ("Spam" "^Content-Type:.*\\(ks_c_5601-1987\\|EUC-KR\\|big5\\|iso-2022-jp\\).*")
     ("Spam" "^Subject:.*\\(This really work\\|XINGA\\|ADV:\\|XXX\\|adult\\|sex\\).*")
     ("Spam" "^Subject:.*\\(\=\?ks_c_5601-1987\?\\|\=\?euc-kr\?\\|\=\?big5\?\\).*")
     ("Spam" "^X-Mailer:\\(.*BulkMailer.*\\|.*MIME::Lite.*\\|\\)")
     ("Spam" "^X-Mailer:\\(.*CyberCreek Avalanche\\|.*http\:\/\/GetResponse\.com\\)")
     ("Spam" "^From:.*\\(verizon\.net\\|prontomail\.com\\|money\\|ConsumerDirect\\).*")
-    ("Spam" "^Delivered-To: GMX delivery to spamtrap@@gmx.bla$")
+    ("Spam" "^Delivered-To: GMX delivery to spamtrap@@gmx.invalid$")
     ("Spam" "^Received: from link2buy.com")
-    ("Spam" "^CC: .*azzrael@@t-online.bla")
+    ("Spam" "^CC: .*azzrael@@t-online.invalid")
     ("Spam" "^X-Mailer-Version: 1.50 BETA")
-    ("Uni" "^\\(CC:\\|To:\\).*localpart@@uni-koblenz.bla.*")
-    ("Inbox" "^\\(CC:\\|To:\\).*\\(my\ name\\|address@@one.bla\\|adress@@two.bla\\)")
+    ("Uni" "^\\(CC:\\|To:\\).*localpart@@uni-koblenz.invalid.*")
+    ("Inbox" "^\\(CC:\\|To:\\).*\\(my\ name\\|address@@one.invalid\\|adress@@two.invalid\\)")
     ("Spam" "")))
 @end example
 @noindent
@@ -1314,7 +1314,7 @@ This example should make the syntax clear:
 (setq gnus-posting-styles
   '((".*"
      (name "Frank Schmitt")
-     (address "me@@there.bla")
+     (address "me@@there.invalid")
      (organization "Hamme net, kren mer och nimmi")
      (signature-file "~/.signature")
      ("X-SampleHeader" "foobar")
@@ -1366,21 +1366,21 @@ at the bottom.
 
 @example
 (setq gnus-posting-styles
-  '((".*"  ;;default
-     (name "Frank Schmitt")
-     (organization "Hamme net, kren mer och nimmi")
-     (signature-file "~/.signature")    )
-    ((message-news-p)  ;;Usenet news?
-     (address "mySpamTrap@@Frank-Schmitt.bla")
-     ("Reply-To" "hereRealRepliesOnlyPlease@@Frank-Schmitt.bla")    )
-    ((message-mail-p)  ;;mail?
-     (address "usedForMails@@Frank-Schmitt.bla")    )
-    ("^gmane" ;;this is mail, too in fact
-     (address "usedForMails@@Frank-Schmitt.net")
-     ("Reply-To" nil)    )
-    ("^gmane.mail.spam.spamassassin.general$"
-     (eval (setq mail-envelope-from "Azzrael@@rz-online.de"))
-     (address "Azzrael@@rz-online.de")) ))
+      '((".*" ;;default
+         (name "Frank Schmitt")
+         (organization "Hamme net, kren mer och nimmi")
+         (signature-file "~/.signature"))
+        ((message-news-p) ;;Usenet news?
+         (address "mySpamTrap@@Frank-Schmitt.invalid")
+         (reply-to "hereRealRepliesOnlyPlease@@Frank-Schmitt.invalid"))
+        ((message-mail-p) ;;mail?
+         (address "usedForMails@@Frank-Schmitt.invalid"))
+        ("^gmane" ;;this is mail, too in fact
+         (address "usedForMails@@Frank-Schmitt.invalid")
+         (reply-to nil))
+        ("^gmane\\.mail\\.spam\\.spamassassin\\.general$"
+         (eval (set (make-local-variable 'message-sendmail-envelope-from)
+                    "Azzrael@@rz-online.de")))))
 @end example
 @noindent
 
@@ -1464,7 +1464,7 @@ You can store your mail addresses in a ~/.mailrc file using a simple
 alias syntax:
 
 @example
-alias al       "Al <al@@english-heritage.bla>"
+alias al       "Al <al@@english-heritage.invalid>"
 @end example
 @noindent
 
@@ -1495,8 +1495,8 @@ place them in ~/.emacs:
 (setq bbdb-north-american-phone-numbers-p nil)
 ;;Tell bbdb about your email address:
 (setq bbdb-user-mail-names
-      (regexp-opt '("Your.Email@@here.bla"
-                    "Your.other@@mail.there.bla")))
+      (regexp-opt '("Your.Email@@here.invalid"
+                    "Your.other@@mail.there.invalid")))
 ;;cycling while completing email addresses
 (setq bbdb-complete-name-allow-cycling t)
 ;;No popup-buffers

diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi
index 5763b65..2dc53d4 100644 (file)
--- a/texi/gnus-ja.texi
+++ b/texi/gnus-ja.texi
@@ -7,8 +7,8 @@
 @syncodeindex pg cp
 
 @copying
-Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-   2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+Copyright @copyright{} 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document

diff --git a/texi/gnus.texi b/texi/gnus.texi
index cfa14db..5198dd1 100644 (file)
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -9,8 +9,8 @@
 @documentencoding ISO-8859-1
 
 @copying
-Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-   2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+Copyright @copyright{} 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document

diff --git a/texi/message-ja.texi b/texi/message-ja.texi
index c902c86..2969401 100644 (file)
--- a/texi/message-ja.texi
+++ b/texi/message-ja.texi
@@ -11,8 +11,8 @@ This file documents Message, the Emacs message composition mode.
 \e$B$3$N%U%!%$%k$O\e(B Emacs \e$B$N%a%C%;!<%8:n@.%b!<%I$G$"$k\e(B Message \e$B$K4X$9$k@bL@J8\e(B
 \e$B=q$G$9!#\e(B
 
-Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-   2005, 2006 Free Software Foundation, Inc.
+Copyright @copyright{} 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+2004, 2005, 2006 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document

diff --git a/texi/message.texi b/texi/message.texi
index 1f4edc6..9ad681b 100644 (file)
--- a/texi/message.texi
+++ b/texi/message.texi
@@ -8,8 +8,8 @@
 @copying
 This file documents Message, the Emacs message composition mode.
 
-Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-   2005, 2006 Free Software Foundation, Inc.
+Copyright @copyright{} 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+2004, 2005, 2006 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document

diff --git a/texi/sieve.texi b/texi/sieve.texi
index cbae86b..95a51f4 100644 (file)
--- a/texi/sieve.texi
+++ b/texi/sieve.texi
@@ -7,9 +7,10 @@
 @synindex pg cp
 
 @copying
-This file documents the Emacs Sieve package.
+This file documents the Emacs Sieve package, for server-side mail filtering.
 
-Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+Copyright @copyright{} 2001, 2002, 2003, 2004, 2005, 2006 Free
+Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document