From: William Morgan <wmorgan-sup@masanjin.net>
Date: Sun, 25 May 2008 04:22:30 +0000 (-0700)
Subject: Merge commit 'origin/unedited-newlines'
X-Git-Url: https://git.notmuchmail.org/git?a=commitdiff_plain;h=f4adc029a972c56d22def1e903dae7d7be89e0b0;p=sup

Merge commit 'origin/unedited-newlines'

Conflicts:

	lib/sup/modes/edit-message-mode.rb
---

f4adc029a972c56d22def1e903dae7d7be89e0b0
diff --cc lib/sup/modes/edit-message-mode.rb
index 88debb2,89476b3..b63a00b
--- a/lib/sup/modes/edit-message-mode.rb
+++ b/lib/sup/modes/edit-message-mode.rb
@@@ -304,10 -304,9 +304,10 @@@ protecte
    def build_message date
      m = RMail::Message.new
      m.header["Content-Type"] = "text/plain; charset=#{$encoding}"
-     m.body = @body.join
+     m.body = @body.join("\n")
 -    m.body = m.body
      m.body += sig_lines.join("\n") unless $config[:edit_signature]
 +    ## body must end in a newline or GPG signatures will be WRONG!
 +    m.body += "\n" unless m.body =~ /\n\Z/
  
      ## there are attachments, so wrap body in an attachment of its own
      unless @attachments.empty?