1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-14 16:50:58 +00:00

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-182

Merge from gnus--rel--5.10

Patches applied:

 * gnus--rel--5.10  (patch 68-69)

   - Update from CVS
This commit is contained in:
Miles Bader 2006-03-28 02:49:25 +00:00
parent 354330cf16
commit 3c02e719ce
2 changed files with 39 additions and 34 deletions

View File

@ -1,3 +1,8 @@
2006-03-27 Reiner Steib <Reiner.Steib@gmx.de>
* gnus-faq.texi: Use .invalid.
([5.4]): Fix gnus-posting-styles example.
2006-03-27 Romain Francoise <romain@orebokech.com> 2006-03-27 Romain Francoise <romain@orebokech.com>
* faq.texi (Emacs/W3): Rename from `w3-mode'. Mention that * faq.texi (Emacs/W3): Rename from `w3-mode'. Mention that

View File

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