Re: [PATCH] emacs: bugfix notmuch-mua-reply when signature is present

diff --git a/61/73c64df178e10c82f15487852efd32fad734f4 b/61/73c64df178e10c82f15487852efd32fad734f4
new file mode 100644 (file)
index 0000000..ef1f951
--- /dev/null
+++ b/61/73c64df178e10c82f15487852efd32fad734f4
@@ -0,0 +1,112 @@
+Return-Path: <tomi.ollila@iki.fi>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id BD7DC431FAF\r
+       for <notmuch@notmuchmail.org>; Fri,  9 Aug 2013 01:19:24 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id Cy35r2EYo84G for <notmuch@notmuchmail.org>;\r
+       Fri,  9 Aug 2013 01:19:12 -0700 (PDT)\r
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
+       by olra.theworths.org (Postfix) with ESMTP id BD2ED431FAE\r
+       for <notmuch@notmuchmail.org>; Fri,  9 Aug 2013 01:19:12 -0700 (PDT)\r
+Received: from guru.guru-group.fi (localhost [IPv6:::1])\r
+       by guru.guru-group.fi (Postfix) with ESMTP id 4E1A41000B2;\r
+       Fri,  9 Aug 2013 11:19:02 +0300 (EEST)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: Geoffrey Ferrari <geoffrey.ferrari@oriel.oxon.org>,\r
+ notmuch@notmuchmail.org\r
+Subject: Re: [PATCH] emacs: bugfix notmuch-mua-reply when signature is present\r
+In-Reply-To:\r
+ <1375961732-14327-1-git-send-email-geoffrey.ferrari@oriel.oxon.org>\r
+References:\r
+ <1375961732-14327-1-git-send-email-geoffrey.ferrari@oriel.oxon.org>\r
+User-Agent: Notmuch/0.16 (http://notmuchmail.org) Emacs/24.3.1\r
+       (x86_64-unknown-linux-gnu)\r
+X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL\r
+       $[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F\r
+       !)g;OY^,BjTbr)Np:%c_o'jj,Z\r
+Date: Fri, 09 Aug 2013 11:19:02 +0300\r
+Message-ID: <m238qjqnt5.fsf@guru.guru-group.fi>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Fri, 09 Aug 2013 08:19:24 -0000\r
+\r
+On Thu, Aug 08 2013, Geoffrey Ferrari <geoffrey.ferrari@oriel.oxon.org> wrote:\r
+\r
+> From: "Geoffrey H. Ferrari" <geoffrey.ferrari@oriel.oxon.org>\r
+>\r
+> When composing a reply, notmuch-mua-reply tries to be smart and cite\r
+> the original message by inserting it before the user signature, if\r
+> one is present. However, the existing method of backward searching\r
+> from the end of the buffer to find the signature separator and then\r
+> moving one line up results in the original message being cited in\r
+> the message headers. That's because at this point the message looks\r
+> like this (with | representing point after searching for the\r
+> signature separator):\r
+>\r
+> From: xxx\r
+> To: xxx\r
+> Subject: xxx\r
+> --text follows this line--\r
+> |--\r
+> My fancy signature\r
+>\r
+> With this patch, a newline is opened instead, so that the orignal\r
+> message is cited above the signature but still in the message text.\r
+> ---\r
+\r
+This probably fixes #1 in id:8762auwgfl.fsf@steelpick.2x.cz\r
+\r
+( http://mid.gmane.org/8762auwgfl.fsf@steelpick.2x.cz )\r
+\r
+... I just noticed I have no clue how to set message signature to test\r
+this... ;/\r
+\r
+\r
+Tomi\r
+\r
+\r
+\r
+>  emacs/notmuch-mua.el |    2 +-\r
+>  1 file changed, 1 insertion(+), 1 deletion(-)\r
+>\r
+> diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el\r
+> index 2baae5f..86f164d 100644\r
+> --- a/emacs/notmuch-mua.el\r
+> +++ b/emacs/notmuch-mua.el\r
+> @@ -194,7 +194,7 @@ list."\r
+>        ;; if one is present\r
+>        (goto-char (point-max))\r
+>        (if (re-search-backward message-signature-separator nil t)\r
+> -      (forward-line -1)\r
+> +      (newline)\r
+>      (goto-char (point-max)))\r
+>  \r
+>        (let ((from (plist-get original-headers :From))\r
+> -- \r
+> 1.7.10.4\r
+>\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r