From 57ae43781764cd6a99d7689eabcd3604704e66b5 Mon Sep 17 00:00:00 2001
From: Tomi Ollila <tomi.ollila@iki.fi>
Date: Wed, 28 Aug 2013 21:53:37 +0300
Subject: [PATCH] Re: [PATCH] emacs: bugfix notmuch-mua-reply when signature is
 present

---
 e4/385a4abf4c0a32e498683fa523adad65164b8a | 124 ++++++++++++++++++++++
 1 file changed, 124 insertions(+)
 create mode 100644 e4/385a4abf4c0a32e498683fa523adad65164b8a

diff --git a/e4/385a4abf4c0a32e498683fa523adad65164b8a b/e4/385a4abf4c0a32e498683fa523adad65164b8a
new file mode 100644
index 000000000..fd2b9b436
--- /dev/null
+++ b/e4/385a4abf4c0a32e498683fa523adad65164b8a
@@ -0,0 +1,124 @@
+Return-Path: <tomi.ollila@iki.fi>
+X-Original-To: notmuch@notmuchmail.org
+Delivered-To: notmuch@notmuchmail.org
+Received: from localhost (localhost [127.0.0.1])
+	by olra.theworths.org (Postfix) with ESMTP id 46245431FC2
+	for <notmuch@notmuchmail.org>; Wed, 28 Aug 2013 11:53:49 -0700 (PDT)
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
+X-Spam-Flag: NO
+X-Spam-Score: 0
+X-Spam-Level: 
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]
+	autolearn=disabled
+Received: from olra.theworths.org ([127.0.0.1])
+	by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
+	with ESMTP id qOIRCXRIejUP for <notmuch@notmuchmail.org>;
+	Wed, 28 Aug 2013 11:53:42 -0700 (PDT)
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])
+	by olra.theworths.org (Postfix) with ESMTP id 52B00431FAE
+	for <notmuch@notmuchmail.org>; Wed, 28 Aug 2013 11:53:42 -0700 (PDT)
+Received: from guru.guru-group.fi (localhost [IPv6:::1])
+	by guru.guru-group.fi (Postfix) with ESMTP id B8316100030;
+	Wed, 28 Aug 2013 21:53:37 +0300 (EEST)
+From: Tomi Ollila <tomi.ollila@iki.fi>
+To: Geoffrey Ferrari <geoffrey.ferrari@oriel.oxon.org>,
+ notmuch@notmuchmail.org
+Subject: Re: [PATCH] emacs: bugfix notmuch-mua-reply when signature is present
+In-Reply-To: <m2sixtyb5k.fsf@guru.guru-group.fi>
+References:
+ <1375961732-14327-1-git-send-email-geoffrey.ferrari@oriel.oxon.org>
+	<m2sixtyb5k.fsf@guru.guru-group.fi>
+User-Agent: Notmuch/0.16+42~g938dae6 (http://notmuchmail.org) Emacs/24.3.1
+	(x86_64-unknown-linux-gnu)
+X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL
+	$[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F
+	!)g;OY^,BjTbr)Np:%c_o'jj,Z
+Date: Wed, 28 Aug 2013 21:53:37 +0300
+Message-ID: <m2ob8hy7da.fsf@guru.guru-group.fi>
+MIME-Version: 1.0
+Content-Type: text/plain
+X-BeenThere: notmuch@notmuchmail.org
+X-Mailman-Version: 2.1.13
+Precedence: list
+List-Id: "Use and development of the notmuch mail system."
+	<notmuch.notmuchmail.org>
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
+	<mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>
+List-Post: <mailto:notmuch@notmuchmail.org>
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
+	<mailto:notmuch-request@notmuchmail.org?subject=subscribe>
+X-List-Received-Date: Wed, 28 Aug 2013 18:53:49 -0000
+
+On Wed, Aug 28 2013, Tomi Ollila <tomi.ollila@iki.fi> wrote:
+
+> On Thu, Aug 08 2013, Geoffrey Ferrari <geoffrey.ferrari@oriel.oxon.org> wrote:
+>
+>> From: "Geoffrey H. Ferrari" <geoffrey.ferrari@oriel.oxon.org>
+>>
+>> When composing a reply, notmuch-mua-reply tries to be smart and cite
+>> the original message by inserting it before the user signature, if
+>> one is present. However, the existing method of backward searching
+>> from the end of the buffer to find the signature separator and then
+>> moving one line up results in the original message being cited in
+>> the message headers. That's because at this point the message looks
+>> like this (with | representing point after searching for the
+>> signature separator):
+>>
+>> From: xxx
+>> To: xxx
+>> Subject: xxx
+>> --text follows this line--
+>> |--
+>> My fancy signature
+>
+> Now that I tested, (with ~/.signature), composing new mail starts with
+>
+> --8<---8<---8<---8<---8<---8<---8<---8<---8<-
+> From: Tomi Ollila <tomi.ollila@iki.fi>
+> To:
+> Subject: 
+> Fcc: /home/too/mail/mails/sent
+> --text follows this line--
+>
+> --
+> signature
+> --8<---8<---8<---8<---8<---8<---8<---8<---8<-
+>
+> Notice the empty line between '--text follows this line--' and '--'
+>
+> In your example, the signature block is -- for some reason --
+> inserted without the empty line.
+>
+>> With this patch, a newline is opened instead, so that the orignal
+>> message is cited above the signature but still in the message text.
+
+....
+
+>>       (goto-char (point-max))
+>>       (if (re-search-backward message-signature-separator nil t)
+>>-	  (forward-line -1)
+>>+	  (newline)
+>>	(goto-char (point-max)))
+
+If the case is like I think, it should have used (open-line 1) instead.
+
+Anyway, what about:
+
+    (goto-char (point-max))
+    (when (re-search-backward message-signature-separator nil t)
+      (forward-line -1)
+      (unless (eolp)
+        (end-of-line)
+        (newline)))
+
+The else clause with (goto-char (point-max)) is unnecessary as 
+with the third argument NOERROR being t point is moved if
+re-search-backward doesn't find match.
+
+>> ---
+>
+> Tomi
+
+Tomi
-- 
2.26.2