From b668fc1854ef3d87ecd091ce16940856ac690b59 Mon Sep 17 00:00:00 2001 From: Tomi Ollila Date: Wed, 28 Aug 2013 23:46:48 +0300 Subject: [PATCH] Re: [PATCH] emacs: bugfix notmuch-mua-reply when signature is present --- 5f/19af107682d9c6e225a3d213edd3a4343fa42b | 162 ++++++++++++++++++++++ 1 file changed, 162 insertions(+) create mode 100644 5f/19af107682d9c6e225a3d213edd3a4343fa42b diff --git a/5f/19af107682d9c6e225a3d213edd3a4343fa42b b/5f/19af107682d9c6e225a3d213edd3a4343fa42b new file mode 100644 index 000000000..05f4244dc --- /dev/null +++ b/5f/19af107682d9c6e225a3d213edd3a4343fa42b @@ -0,0 +1,162 @@ +Return-Path: +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 2FC6C431FBC + for ; Wed, 28 Aug 2013 13:47:06 -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 YchIN6f5PUQC for ; + Wed, 28 Aug 2013 13:46:58 -0700 (PDT) +Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34]) + by olra.theworths.org (Postfix) with ESMTP id 8D9FF431FAE + for ; Wed, 28 Aug 2013 13:46:58 -0700 (PDT) +Received: from guru.guru-group.fi (localhost [IPv6:::1]) + by guru.guru-group.fi (Postfix) with ESMTP id BC303100030; + Wed, 28 Aug 2013 23:46:48 +0300 (EEST) +From: Tomi Ollila +To: Jani Nikula , + Geoffrey Ferrari , notmuch@notmuchmail.org +Subject: Re: [PATCH] emacs: bugfix notmuch-mua-reply when signature is present +In-Reply-To: <87sixtsj1y.fsf@nikula.org> +References: + <1375961732-14327-1-git-send-email-geoffrey.ferrari@oriel.oxon.org> + + <87sixtsj1y.fsf@nikula.org> +User-Agent: Notmuch/0.16+42~g938dae6 (http://notmuchmail.org) Emacs/24.3.1 + (x86_64-unknown-linux-gnu) +X-Face: HhBM'cA~ +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." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Wed, 28 Aug 2013 20:47:06 -0000 + +On Wed, Aug 28 2013, Jani Nikula wrote: + +> On Wed, 28 Aug 2013, Tomi Ollila wrote: +>> On Wed, Aug 28 2013, Tomi Ollila wrote: +>> +>>> On Thu, Aug 08 2013, Geoffrey Ferrari wrote: +>>> +>>>> From: "Geoffrey H. Ferrari" +>>>> +>>>> 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 +>>> 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: +> +> Hi Tomi, what about [1] instead? KISS and all that. + +Indeed, I just looked that. Looks Good. Will test tomorrow... + +> +> Cheers, +> Jani. + +Tomi + +PS: my test signature intentionally left there ;) + +> +> [1] id:cover.1377718199.git.jani@nikula.org +> +> +>> +>> (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 +>> _______________________________________________ +>> notmuch mailing list +>> notmuch@notmuchmail.org +>> http://notmuchmail.org/mailman/listinfo/notmuch +> +> -- +> whoaaa +> +> asdfasfd +> _______________________________________________ +> notmuch mailing list +> notmuch@notmuchmail.org +> http://notmuchmail.org/mailman/listinfo/notmuch +> + +-- +foobar -- 2.26.2