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