From mboxrd@z Thu Jan 1 00:00:00 1970 Path: main.gmane.org!not-for-mail From: Simon Josefsson Newsgroups: gmane.emacs.devel Subject: [PATCH] Fix smtpmail-via-smtp Date: Wed, 13 Nov 2002 10:26:43 +0100 Sender: emacs-devel-admin@gnu.org Message-ID: NNTP-Posting-Host: main.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: main.gmane.org 1037201044 20126 80.91.224.249 (13 Nov 2002 15:24:04 GMT) X-Complaints-To: usenet@main.gmane.org NNTP-Posting-Date: Wed, 13 Nov 2002 15:24:04 +0000 (UTC) Return-path: Original-Received: from quimby.gnus.org ([80.91.224.244]) by main.gmane.org with esmtp (Exim 3.35 #1 (Debian)) id 18BzCI-00044w-00 for ; Wed, 13 Nov 2002 16:12:54 +0100 Original-Received: from monty-python.gnu.org ([199.232.76.173]) by quimby.gnus.org with esmtp (Exim 3.12 #1 (Debian)) id 18BzOF-00066k-00 for ; Wed, 13 Nov 2002 16:25:15 +0100 Original-Received: from localhost ([127.0.0.1] helo=monty-python.gnu.org) by monty-python.gnu.org with esmtp (Exim 4.10) id 18Bu1P-0006OG-00; Wed, 13 Nov 2002 04:41:19 -0500 Original-Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.10) id 18Btnn-0004RA-00 for emacs-devel@gnu.org; Wed, 13 Nov 2002 04:27:15 -0500 Original-Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.10) id 18Btnj-0004Q3-00 for emacs-devel@gnu.org; Wed, 13 Nov 2002 04:27:14 -0500 Original-Received: from 178.230.13.217.in-addr.dgcsystems.net ([217.13.230.178] helo=yxa.extundo.com) by monty-python.gnu.org with esmtp (Exim 4.10) id 18Btni-0004Pm-00 for emacs-devel@gnu.org; Wed, 13 Nov 2002 04:27:10 -0500 Original-Received: from latte.josefsson.org (yxa.extundo.com [217.13.230.178]) (authenticated bits=0) by yxa.extundo.com (8.12.6/8.12.6) with ESMTP id gAD9QlFu014637 (version=TLSv1/SSLv3 cipher=EDH-RSA-DES-CBC3-SHA bits=168 verify=NO) for ; Wed, 13 Nov 2002 10:26:47 +0100 Original-To: emacs-devel@gnu.org X-Hashcash: 0:021113:emacs-devel@gnu.org:f5b9698c3cd9954d User-Agent: Gnus/5.090008 (Oort Gnus v0.08) Emacs/21.2.92 (i686-pc-linux-gnu) Errors-To: emacs-devel-admin@gnu.org X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.0.11 Precedence: bulk List-Help: List-Post: List-Subscribe: , List-Id: Emacs development discussions. List-Unsubscribe: , List-Archive: Xref: main.gmane.org gmane.emacs.devel:9342 X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:9342 It seems feedmail.el calls smtpmail-via-smtp directly, not via smtpmail-send-it, causing smtpmail-mail-address to never be set. This patch makes it falls back on user-mail-address in this case. I will commit this shortly unless someone objects. 2002-11-13 Simon Josefsson * mail/smtpmail.el (smtpmail-via-smtp): Fall back to user-mail-address as sender. --- smtpmail.el.~1.50.~ 2002-10-11 04:18:20.000000000 +0200 +++ smtpmail.el 2002-11-13 10:23:22.000000000 +0100 @@ -540,7 +540,9 @@ (host (or smtpmail-smtp-server (error "`smtpmail-smtp-server' not defined"))) (port smtpmail-smtp-service) - (envelope-from (mail-envelope-from)) + (envelope-from (or (mail-envelope-from) + smtpmail-mail-address + user-mail-address) response-code greeting process-buffer @@ -690,8 +692,7 @@ ""))) ; (smtpmail-send-command process (format "MAIL FROM:%s@%s" (user-login-name) (smtpmail-fqdn))) (smtpmail-send-command process (format "MAIL FROM: <%s>%s%s" - (or envelope-from - smtpmail-mail-address) + envelope-from size-part body-part))