From: yamaoka <yamaoka>
Date: Wed, 26 Feb 2003 06:20:09 +0000 (+0000)
Subject: Synch to Oort Gnus.
X-Git-Tag: t-gnus-6_15_17-00-quimby~39
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9c7676f300b9963d5f3e36a5724680c1940018f7;p=elisp%2Fgnus.git-

Synch to Oort Gnus.
---

diff --git a/texi/ChangeLog b/texi/ChangeLog
index aa71917..92f9b75 100644
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,8 @@
+2003-02-26  Jesper Harder  <harder@ifa.au.dk>
+
+	* message.texi (Mail Variables): Add
+	message-sendmail-envelope-from.
+
 2003-02-24  Reiner Steib  <Reiner.Steib@gmx.de>
 
 	* gnus.texi (Mail and Post): Added `gnus-user-agent', removed
diff --git a/texi/message-ja.texi b/texi/message-ja.texi
index cbcec09..21c7f00 100644
--- a/texi/message-ja.texi
+++ b/texi/message-ja.texi
@@ -1423,6 +1423,13 @@ qmail-inject プログラムに渡す引数です。これは文字列のリストで、それぞれ
 非-@code{nil} で sendmail のコマンド行に @samp{-f username} を付加しませ
 ん。そうすることは、付加しないより邪悪ですらあるでしょう。
 
+@item message-sendmail-envelope-from
+@vindex message-sendmail-envelope-from
+@code{message-sendmail-f-is-evil} が @code{nil} のとき、これで SMTP エン
+ベロープで使うアドレスを指定します。@code{nil} だった
+ら @code{user-mail-address} を使います。シンボル @code{header} だったら、
+メッセージの @samp{From} ヘッダーを使います。
+
 @item message-mailer-swallows-blank-line
 @vindex message-mailer-swallows-blank-line
 システムのメイラーがヘッダーと本文を一緒にしてしまう場合は、
diff --git a/texi/message.texi b/texi/message.texi
index 1c6bc89..c387174 100644
--- a/texi/message.texi
+++ b/texi/message.texi
@@ -1420,6 +1420,13 @@ might set this variable to @code{'("-f" "you@@some.where")}.
 Non-@code{nil} means don't add @samp{-f username} to the sendmail
 command line.  Doing so would be even more evil than leaving it out.
 
+@item message-sendmail-envelope-from
+@vindex message-sendmail-envelope-from
+When @code{message-sendmail-f-is-evil} is @code{nil}, this specifies
+the address to use in the SMTP envelope.  If it is @code{nil}, use
+@code{user-mail-address}.  If it is the symbol @code{header}, use the
+@samp{From} header of the message.
+
 @item message-mailer-swallows-blank-line
 @vindex message-mailer-swallows-blank-line
 Set this to non-@code{nil} if the system's mailer runs the header and