Re: [PATCH 1/1] emacs: fix notmuch-mua-reply point placement when signature involved

diff --git a/27/a0cfa3725791edcdc67509f1cab680699f83c5 b/27/a0cfa3725791edcdc67509f1cab680699f83c5
new file mode 100644 (file)
index 0000000..063479d
--- /dev/null
+++ b/27/a0cfa3725791edcdc67509f1cab680699f83c5
@@ -0,0 +1,154 @@
+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 0C244431FDD\r
+       for <notmuch@notmuchmail.org>; Thu,  5 Sep 2013 07:22:36 -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 ru8DjhWrlEq5 for <notmuch@notmuchmail.org>;\r
+       Thu,  5 Sep 2013 07:22:29 -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 7EBE7431FDB\r
+       for <notmuch@notmuchmail.org>; Thu,  5 Sep 2013 07:22:29 -0700 (PDT)\r
+Received: from guru.guru-group.fi (localhost [IPv6:::1])\r
+       by guru.guru-group.fi (Postfix) with ESMTP id D3BFA10005E;\r
+       Thu,  5 Sep 2013 17:22:21 +0300 (EEST)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: Jani Nikula <jani@nikula.org>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH 1/1] emacs: fix notmuch-mua-reply point placement when\r
+       signature involved\r
+In-Reply-To: <87d2one4u0.fsf@nikula.org>\r
+References: <1378322458-30159-1-git-send-email-tomi.ollila@iki.fi>\r
+       <87d2one4u0.fsf@nikula.org>\r
+User-Agent: Notmuch/0.16+60~gbdcc747 (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: Thu, 05 Sep 2013 17:22:21 +0300\r
+Message-ID: <m2txhzfiw2.fsf@guru.guru-group.fi>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=utf-8\r
+Content-Transfer-Encoding: quoted-printable\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: Thu, 05 Sep 2013 14:22:36 -0000\r
+\r
+On Thu, Sep 05 2013, Jani Nikula <jani@nikula.org> wrote:\r
+\r
+> On Wed, 04 Sep 2013, "Tomi.Ollila" <tomi.ollila@iki.fi> wrote:\r
+>> From: Tomi Ollila <tomi.ollila@iki.fi>\r
+>>\r
+>> When composing a reply, notmuch-mua-reply attempts to  cite the\r
+>> the original message by inserting it before the user signature, if\r
+>> one is present. The existing method used to search the signature\r
+>> separator backward from the end of the buffer and then move one\r
+>> line up. In case of variable `message-signature-insert-empty-line'\r
+>> being nil (and `message-signature-setup-hook' not intervening) this\r
+>> caused point to go to the beginning of '--text follows this line--'\r
+>> separator line, and citation was inserted there.\r
+>> This change checks the value of `message-signature-insert-empty-line'\r
+>> and doesn't move point if that is nil. Additional narrowing to\r
+>> the body region ensures that point never goes to the separator line\r
+>> (or beyond).\r
+>>\r
+>> Original patch from "Geoffrey H. Ferrari", continued with iterations\r
+>> from Jani and Mark.\r
+>\r
+> Hi Tomi, I don't think you've sufficiently convinced me why we need all\r
+> this complexity instead of just doing [1]. And if you do get me\r
+> convinced, I'd like the reason to be in the commit message and in a\r
+> comment above the piece of code in question.\r
+\r
+(add-hook 'message-signature-setup-hook=20\r
+   (lambda () (insert "Insert this text before the citation not after.\n")))\r
+\r
+>From emacs documentation:\r
+\r
+message-signature-setup-hook is a variable defined in `message.el'.\r
+Its value is nil\r
+\r
+  This variable may be risky if used as a file-local variable.\r
+\r
+Documentation:\r
+Normal hook, run each time a new outgoing message is initialized.\r
+It is run after the headers have been inserted and before\r
+the signature is inserted.\r
+\r
+You can customize this variable.\r
+\r
+\r
+Adding the comments is a good idea -- if the above convinces you\r
+I'll prepare comments along this idea.\r
+\r
+> Cheers,\r
+> Jani.\r
+\r
+Tomi\r
+\r
+>\r
+>\r
+> [1] id:cover.1377718199.git.jani@nikula.org\r
+>\r
+>\r
+>\r
+>\r
+>> ---\r
+>>  emacs/notmuch-mua.el | 12 ++++++++----\r
+>>  1 file changed, 8 insertions(+), 4 deletions(-)\r
+>>\r
+>> diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el\r
+>> index 2baae5f..0280c9f 100644\r
+>> --- a/emacs/notmuch-mua.el\r
+>> +++ b/emacs/notmuch-mua.el\r
+>> @@ -192,10 +192,14 @@ list."\r
+>>=20=20\r
+>>        ;; Insert the message body - but put it in front of the signature\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
+>> -   (goto-char (point-max)))\r
+>> +      (save-restriction\r
+>> +   (message-goto-body)\r
+>> +   (narrow-to-region (point) (point-max))\r
+>> +   (goto-char (point-max))\r
+>> +   (if (re-search-backward message-signature-separator nil t)\r
+>> +       (if message-signature-insert-empty-line\r
+>> +           (forward-line -1))\r
+>> +     (goto-char (point-max))))\r
+>>=20=20\r
+>>        (let ((from (plist-get original-headers :From))\r
+>>         (date (plist-get original-headers :Date))\r
+>> --=20\r
+>> 1.8.0\r
+>>\r
+>> _______________________________________________\r
+>> notmuch mailing list\r
+>> notmuch@notmuchmail.org\r
+>> http://notmuchmail.org/mailman/listinfo/notmuch\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r
+>\r
+\r
+--=20\r
+"kaik on m=C3=A4nt!"\r