From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.bugs Subject: bug#7589: smtpmail: bad line endings in queued mails on Windows Date: Sat, 11 Dec 2010 12:07:39 +0200 Message-ID: <83d3p8vd04.fsf@gnu.org> References: <83lj3x1yqx.fsf@gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: QUOTED-PRINTABLE X-Trace: dough.gmane.org 1292062953 13195 80.91.229.12 (11 Dec 2010 10:22:33 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sat, 11 Dec 2010 10:22:33 +0000 (UTC) Cc: 7589@debbugs.gnu.org To: Vida =?UTF-8?Q?G=C3=A1bor?= Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sat Dec 11 11:22:29 2010 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1PRMay-0002u5-S5 for geb-bug-gnu-emacs@m.gmane.org; Sat, 11 Dec 2010 11:22:29 +0100 Original-Received: from localhost ([127.0.0.1]:34529 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PRMay-0003j5-2S for geb-bug-gnu-emacs@m.gmane.org; Sat, 11 Dec 2010 05:22:28 -0500 Original-Received: from [140.186.70.92] (port=35227 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PRMaq-0003in-Q0 for bug-gnu-emacs@gnu.org; Sat, 11 Dec 2010 05:22:21 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PRMap-00089e-QN for bug-gnu-emacs@gnu.org; Sat, 11 Dec 2010 05:22:20 -0500 Original-Received: from debbugs.gnu.org ([140.186.70.43]:45666) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PRMap-00089S-OW for bug-gnu-emacs@gnu.org; Sat, 11 Dec 2010 05:22:19 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.69) (envelope-from ) id 1PRMHC-0002LR-9p; Sat, 11 Dec 2010 05:02:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Eli Zaretskii Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-To: owner@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 11 Dec 2010 10:02:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 7589 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 7589-submit@debbugs.gnu.org id=B7589.12920616868969 (code B ref 7589); Sat, 11 Dec 2010 10:02:02 +0000 Original-Received: (at 7589) by debbugs.gnu.org; 11 Dec 2010 10:01:26 +0000 Original-Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1PRMGb-0002Kc-Ep for submit@debbugs.gnu.org; Sat, 11 Dec 2010 05:01:25 -0500 Original-Received: from mtaout21.012.net.il ([80.179.55.169]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1PRMGY-0002KI-7w for 7589@debbugs.gnu.org; Sat, 11 Dec 2010 05:01:23 -0500 Original-Received: from conversion-daemon.a-mtaout21.012.net.il by a-mtaout21.012.net.il (HyperSendmail v2007.08) id <0LD900J00D655O00@a-mtaout21.012.net.il> for 7589@debbugs.gnu.org; Sat, 11 Dec 2010 12:07:26 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([84.229.142.197]) by a-mtaout21.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0LD900JPBDGC3B40@a-mtaout21.012.net.il>; Sat, 11 Dec 2010 12:07:26 +0200 (IST) In-reply-to: X-012-Sender: halo1@inter.net.il X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list Resent-Date: Sat, 11 Dec 2010 05:02:02 -0500 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:42419 Archived-At: > Date: Sat, 11 Dec 2010 10:43:47 +0100 > From: Vida G=E1bor > Cc: 7589@debbugs.gnu.org >=20 > smtpmail-code-conv-from is nil and the return value of > (coding-system-change-eol-conversion ...) is also nil right after t= he > function call of (set-buffer-file-coding-system ...) that you modif= ied > in your patch. Sorry, missed that use-case. How about the patch below? (It is relative to the original version of smtpmail.el.) =3D=3D=3D modified file 'lisp/mail/smtpmail.el' --- lisp/mail/smtpmail.el=092010-12-09 01:46:03 +0000 +++ lisp/mail/smtpmail.el=092010-12-11 10:03:04 +0000 @@ -392,7 +392,14 @@ The list is in preference order.") =09=09(make-directory smtpmail-queue-dir t)) =09 (with-current-buffer buffer-data =09=09(erase-buffer) -=09=09(set-buffer-file-coding-system smtpmail-code-conv-from nil t) +=09=09(set-buffer-file-coding-system +=09=09 ;; We will be reading the file with no-conversion in +=09=09 ;; smtpmail-send-queued-mail below, so write it out +=09=09 ;; with Unix EOLs. +=09=09 (coding-system-change-eol-conversion +=09=09 (or smtpmail-code-conv-from 'undecided) +=09=09 'unix) +=09=09 nil t) =09=09(insert-buffer-substring tembuf) =09=09(write-file file-data) =09=09(set-buffer buffer-elisp)