From: Mark Walters Date: Fri, 6 Sep 2013 17:16:11 +0000 (+0100) Subject: Re: [PATCH 1/1] emacs: fix notmuch-mua-reply point placement when signature involved X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=bd98dc7692beb195fc36e18771e2e73adfc78b2e;p=notmuch-archives.git Re: [PATCH 1/1] emacs: fix notmuch-mua-reply point placement when signature involved --- diff --git a/b4/66d1bb51d108a36ba8833483037ed6c99b9d07 b/b4/66d1bb51d108a36ba8833483037ed6c99b9d07 new file mode 100644 index 000000000..80e6851c0 --- /dev/null +++ b/b4/66d1bb51d108a36ba8833483037ed6c99b9d07 @@ -0,0 +1,141 @@ +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 27B24431FD9 + for ; Fri, 6 Sep 2013 10:16:19 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -1.098 +X-Spam-Level: +X-Spam-Status: No, score=-1.098 tagged_above=-999 required=5 + tests=[DKIM_ADSP_CUSTOM_MED=0.001, FREEMAIL_FROM=0.001, + NML_ADSP_CUSTOM_MED=1.2, RCVD_IN_DNSWL_MED=-2.3] 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 7QDAmgVVXCyG for ; + Fri, 6 Sep 2013 10:16:15 -0700 (PDT) +Received: from mail2.qmul.ac.uk (mail2.qmul.ac.uk [138.37.6.6]) + (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 2EA4A431FBF + for ; Fri, 6 Sep 2013 10:16:15 -0700 (PDT) +Received: from smtp.qmul.ac.uk ([138.37.6.40]) + by mail2.qmul.ac.uk with esmtp (Exim 4.71) + (envelope-from ) + id 1VHzdl-0001zm-Dw; Fri, 06 Sep 2013 18:16:14 +0100 +Received: from 93-97-24-31.zone5.bethere.co.uk ([93.97.24.31] helo=localhost) + by smtp.qmul.ac.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.71) + (envelope-from ) + id 1VHzdl-0003O7-5B; Fri, 06 Sep 2013 18:16:13 +0100 +From: Mark Walters +To: Tomi Ollila , notmuch@notmuchmail.org +Subject: Re: [PATCH 1/1] emacs: fix notmuch-mua-reply point placement when + signature involved +In-Reply-To: <1378477938-26020-1-git-send-email-tomi.ollila@iki.fi> +References: <1378477938-26020-1-git-send-email-tomi.ollila@iki.fi> +User-Agent: Notmuch/0.16 (http://notmuchmail.org) Emacs/23.4.1 + (x86_64-pc-linux-gnu) +Date: Fri, 06 Sep 2013 18:16:11 +0100 +Message-ID: <87a9jpg9b8.fsf@qmul.ac.uk> +MIME-Version: 1.0 +Content-Type: text/plain; charset=us-ascii +X-Sender-Host-Address: 93.97.24.31 +X-QM-SPAM-Info: Sender has good ham record. :) +X-QM-Body-MD5: 7f8cbb3abb8ac1ed5150c2d39fdac44a (of first 20000 bytes) +X-SpamAssassin-Score: 0.0 +X-SpamAssassin-SpamBar: / +X-SpamAssassin-Report: The QM spam filters have analysed this message to + determine if it is + spam. We require at least 5.0 points to mark a message as spam. + This message scored 0.0 points. Summary of the scoring: + * 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail + provider * (markwalters1009[at]gmail.com) + * 0.0 AWL AWL: From: address is in the auto white-list +X-QM-Scan-Virus: ClamAV says the message is clean +Cc: tomi.ollila@iki.fi +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: Fri, 06 Sep 2013 17:16:19 -0000 + + +This LGTM +1 + +Mark + +On Fri, 06 Sep 2013, Tomi Ollila wrote: +> When composing a reply, notmuch-mua-reply attempts to cite the +> the original message by inserting it before the user signature, if +> one is present. The existing method used to search the signature +> separator backward from the end of the buffer and then move one +> line up. In case of variable `message-signature-insert-empty-line' +> being nil this caused point to go to the beginning of +> '--text follows this line--' +> separator line, and citation was inserted there. +> This change checks the value of `message-signature-insert-empty-line' +> and doesn't move point if that is nil. Additional narrowing to +> the body region ensures that point never goes to the separator line +> (or beyond). +> `message-signature-setup-hook' or `message-setup-hook' may already have +> added some other content to the message body, therefore using simply +> (message-goto-body) to move point to the beginning of body might lead +> to unexpected results. +> +> Original patch from "Geoffrey H. Ferrari", continued with iterations +> from Jani and Mark. +> --- +> +> This is update to +> +> id:1378322458-30159-1-git-send-email-tomi.ollila@iki.fi +> +> with comment changes only. +> +> Tomi +> +> emacs/notmuch-mua.el | 15 ++++++++++----- +> 1 file changed, 10 insertions(+), 5 deletions(-) +> +> diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el +> index ff8149b..d41c0b3 100644 +> --- a/emacs/notmuch-mua.el +> +++ b/emacs/notmuch-mua.el +> @@ -196,11 +196,16 @@ list." +> nil (notmuch-mua-get-switch-function)))) +> +> ;; Insert the message body - but put it in front of the signature +> - ;; if one is present +> - (goto-char (point-max)) +> - (if (re-search-backward message-signature-separator nil t) +> - (forward-line -1) +> - (goto-char (point-max))) +> + ;; if one is present, and after any other content +> + ;; message*setup-hooks may have added to the message body already. +> + (save-restriction +> + (message-goto-body) +> + (narrow-to-region (point) (point-max)) +> + (goto-char (point-max)) +> + (if (re-search-backward message-signature-separator nil t) +> + (if message-signature-insert-empty-line +> + (forward-line -1)) +> + (goto-char (point-max)))) +> +> (let ((from (plist-get original-headers :From)) +> (date (plist-get original-headers :Date)) +> -- +> 1.8.0 +> +> _______________________________________________ +> notmuch mailing list +> notmuch@notmuchmail.org +> http://notmuchmail.org/mailman/listinfo/notmuch