From 70608b8fe99050e090fd6aa4000b60465e6531a6 Mon Sep 17 00:00:00 2001 From: Jesper Harder Date: Tue, 25 Feb 2003 22:11:57 +0000 Subject: [PATCH] (message-sendmail-envelope-from): New option. (message-sendmail-envelope-from): New function. (message-send-mail-with-sendmail): Use it. --- lisp/ChangeLog | 6 ++++++ lisp/message.el | 21 ++++++++++++++++++++- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b6e486956..56a2f407f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2003-02-25 Jesper Harder + + * message.el (message-sendmail-envelope-from): New option. + (message-sendmail-envelope-from): New function. + (message-send-mail-with-sendmail): Use it. + 2003-02-25 Reiner Steib * gnus-art.el (gnus-button-mid-or-mail-heuristic-alist): Added diff --git a/lisp/message.el b/lisp/message.el index f75e9c041..9782827d4 100644 --- a/lisp/message.el +++ b/lisp/message.el @@ -636,6 +636,15 @@ Doing so would be even more evil than leaving it out." :group 'message-sending :type 'boolean) +(defcustom message-sendmail-envelope-from nil + "*Envelope-from when sending mail with sendmail. +If this is nil, use `user-mail-address'. If it is the symbol +`header', use the From: header of the message." + :type '(choice (string :tag "From name") + (const :tag "Use From: header from message" header) + (const :tag "Use `user-mail-address'" nil)) + :group 'message-sending) + ;; qmail-related stuff (defcustom message-qmail-inject-program "/var/qmail/bin/qmail-inject" "Location of the qmail-inject program." @@ -3550,7 +3559,7 @@ If you always want Gnus to send messages in one piece, set ;; But some systems are more broken with -f, so ;; we'll let users override this. (if (null message-sendmail-f-is-evil) - (list "-f" (message-make-address))) + (list "-f" (message-sendmail-envelope-from))) ;; These mean "report errors by mail" ;; and "deliver in background". (if (null message-interactive) '("-oem" "-odb")) @@ -4506,6 +4515,16 @@ give as trustworthy answer as possible." (nth 1 (mail-extract-address-components user-mail-address)) user-mail-address))) +(defun message-sendmail-envelope-from () + "Return the envelope from." + (cond ((eq message-sendmail-envelope-from 'header) + (nth 1 (mail-extract-address-components + (message-fetch-field "from")))) + ((stringp message-sendmail-envelope-from) + message-sendmail-envelope-from) + (t + (message-make-address)))) + (defun message-make-fqdn () "Return user's fully qualified domain name." (let* ((system-name (system-name)) -- 2.25.1